Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #733 from ArthurHoaro/hotfix/reverse-proxy-port 

Hide default ports in local URL behind a reverse proxy
This commit is contained in:
Arthur 2017-01-04 16:34:06 +01:00 committed by GitHub
parent 2d3a9be73d 8e4be77368
commit 061f04fba0
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/HttpUtils.php
View File

@ -297,9 +297,17 @@ function server_url($server)
// Keep forwarded port
if (strpos($server['HTTP_X_FORWARDED_PORT'], ',') !== false) {
$ports = explode(',', $server['HTTP_X_FORWARDED_PORT']);
$port = ':' . trim($ports[0]);
$port = trim($ports[0]);
} else {
$port = ':' . $server['HTTP_X_FORWARDED_PORT'];
$port = $server['HTTP_X_FORWARDED_PORT'];
}
if (($scheme == 'http' && $port != '80')
|| ($scheme == 'https' && $port != '443')
) {
$port = ':' . $port;
} else {
$port = '';
}
}

13
tests/HttpUtils/ServerUrlTest.php
View File

@ -68,6 +68,19 @@ class ServerUrlTest extends PHPUnit_Framework_TestCase
)
);
$this->assertEquals(
'https://host.tld',
server_url(
array(
'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '443'
)
)
);
$this->assertEquals(
'https://host.tld:4974',
server_url(