ENGCOM-3170: Support of error pages behind a load balancer that serves HTTPS #18333

magento-engcom-team · magento-engcom-team · commit 01e5df9c74f0 · 2018-10-12T04:01:20.000-05:00
- Merge Pull Request #18333 from stkams/magento2:2.3-develop - Merged commits: 1. e120448 2. b1b3928 3. 53452fb 4. 320c0aa
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -265,7 +265,8 @@ public function getHostUrl()
             $host = 'localhost';
         }
 
-        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');
+        $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off')
+            || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
         $url = ($isSecure ? 'https://' : 'http://') . $host;
 
         if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,8 @@ public function getHostUrl()`
`265`	`265`	`$host = 'localhost';`
`266`	`266`	`}`
`267`	`267`
`268`		`- $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');`
	`268`	`+ $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] !== 'off')`
	`269`	`+ \|\| isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');`
`269`	`270`	`$url = ($isSecure ? 'https://' : 'http://') . $host;`
`270`	`271`
`271`	`272`	`if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])`