fix(core) Fix port detection when using a proxy and https

issue #6108

fix(core) Fix port detection when using a proxy and https
issue #6108
99edf17b · Côme Chilliet · 8541462d · 99edf17b
Unverified Commit 99edf17b authored 4 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 4 deletions
+5 -4
--- a/include/class_URL.inc
+++ b/include/class_URL.inc
@@ -46,15 +46,16 @@ class URL
      $protocol .= 's';
    }

-    $port = '80';
    if (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
      $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
-      if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-        $port = $_SERVER['HTTP_X_FORWARDED_PORT'];
-      }
      if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
        $protocol = $_SERVER['HTTP_X_FORWARDED_PROTO'];
      }
+      if (isset($_SERVER['HTTP_X_FORWARDED_PORT'])) {
+        $port = $_SERVER['HTTP_X_FORWARDED_PORT'];
+      } else {
+        $port = ($protocol === 'http' ? 80 : 443);
+      }
    } else {
      if (!empty($_SERVER['HTTP_HOST'])) {
        $host = $_SERVER['HTTP_HOST'];