aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Ollmann <tobias@holzgeist.at>2015-09-17 19:44:45 +0200
committerTobias Ollmann <tobias@holzgeist.at>2015-09-17 19:44:45 +0200
commit6d01f33d9fa973c6209c1e6350aeea429b4c31b9 (patch)
tree307e28a1a2db724caea8cbe7a1537a1fa8e06338
parentd58534e8779dd9b4a6ac5386428ae562bc0b5fab (diff)
Do not add the server port when sitting behind a proxy.
Assume that Http-X-Forwarded-Host is set correctly
-rw-r--r--include/functions_url.inc.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 9cc6c9ec7..138a895e1 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -69,14 +69,14 @@ function get_absolute_root_url($with_scheme=true)
else
{
$url .= $_SERVER['HTTP_HOST'];
- }
- if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
- ||($is_https && $_SERVER['SERVER_PORT'] != 443))
- {
- $url_port = ':'.$_SERVER['SERVER_PORT'];
- if (strrchr($url, ':') != $url_port)
+ if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
+ ||($is_https && $_SERVER['SERVER_PORT'] != 443))
{
- $url .= $url_port;
+ $url_port = ':'.$_SERVER['SERVER_PORT'];
+ if (strrchr($url, ':') != $url_port)
+ {
+ $url .= $url_port;
+ }
}
}
}