From: wn_ <invalid@email.com>
Date: Sun, 23 Apr 2017 19:17:24 +0000 (-0500)
Subject: Respect 'proxy_all' during optional SSL whitelist rewrite
X-Git-Tag: 17.12~245^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c7360f4a54e9470fc36105f5a4289769ca402889;p=tt-rss.git

Respect 'proxy_all' during optional SSL whitelist rewrite
---

diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 8419b8a8..86f79c69 100644
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -126,8 +126,12 @@ class Af_Zz_ImgProxy extends Plugin {
 				foreach (explode(" " , $this->ssl_known_whitelist) as $host) {
 					if (substr(strtolower($parts['host']), -strlen($host)) === strtolower($host)) {
 						$parts['scheme'] = 'https';
-
-						return build_url($parts);
+						$url = build_url($parts);
+						if ($all_remote && $is_remote) {
+							break;
+						} else {
+							return $url;
+						}
 					}
 				}