Commit b3d80169 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1717861: fix incorrect full script path when using sslproxy"

parents 6cde1c9a 4655c27f
......@@ -3483,6 +3483,11 @@ function get_full_script_path() {
if (!empty($url['port'])) {
$hostname .= ':'.$url['port'];
} else if (!empty($_SERVER['SERVER_PORT'])) {
// SSL proxy could be on a random port and we don't want it to appear in URL.
if (get_config('sslproxy')) {
$_SERVER['SERVER_PORT'] = '443';
}
if ($_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$hostname .= ':'.$_SERVER['SERVER_PORT'];
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment