Fix for #12969 - server port detection for errors

Logan Stellway · web-flow · commit 422d24444321 · 2018-10-04T15:36:06.000-07:00
Updates `getHostUrl()` method to reference `HTTP_HOST` rather than `SERVER_PORT`.
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -268,10 +268,11 @@ public function getHostUrl()
         $isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');
         $url = ($isSecure ? 'https://' : 'http://') . $host;
 
-        if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])
+        $port = explode(':', $host);
+        if (isset($port[1]) && !in_array($port[1], [80, 443])
             && !preg_match('/.*?\:[0-9]+$/', $url)
         ) {
-            $url .= ':' . $_SERVER['SERVER_PORT'];
+            $url .= ':' . $port[1];
         }
         return  $url;
     }

Original file line number	Diff line number	Diff line change
`@@ -268,10 +268,11 @@ public function getHostUrl()`
`268`	`268`	`$isSecure = (!empty($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] != 'off');`
`269`	`269`	`$url = ($isSecure ? 'https://' : 'http://') . $host;`
`270`	`270`
`271`		`- if (!empty($_SERVER['SERVER_PORT']) && !in_array($_SERVER['SERVER_PORT'], [80, 443])`
	`271`	`+ $port = explode(':', $host);`
	`272`	`+ if (isset($port[1]) && !in_array($port[1], [80, 443])`
`272`	`273`	`&& !preg_match('/.*?\:[0-9]+$/', $url)`
`273`	`274`	`) {`
`274`		`- $url .= ':' . $_SERVER['SERVER_PORT'];`
	`275`	`+ $url .= ':' . $port[1];`
`275`	`276`	`}`
`276`	`277`	`return $url;`
`277`	`278`	`}`