tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2852 from stojg/director-test-http-port

Browse Source 
BUG: Director::test() don't respect port settings in $_FILE_TO_URL_MAPPING
This commit is contained in:
Sean Harvey 2014-02-17 13:55:53 +13:00
commit 3b9d49e32d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
control/Director.php
View File

@ -247,7 +247,13 @@ class Director implements TemplateGlobalProvider {
// Handle absolute URLs // Handle absolute URLs
if (@parse_url($url, PHP_URL_HOST) != '') { if (@parse_url($url, PHP_URL_HOST) != '') {
$bits = parse_url($url); $bits = parse_url($url);
$_SERVER['HTTP_HOST'] = $bits['host']; // If a port is mentioned in the absolute URL, be sure to add that into the
// HTTP host
if(isset($bits['port'])) {
$_SERVER['HTTP_HOST'] = $bits['host'].':'.$bits['port'];
} else {
$_SERVER['HTTP_HOST'] = $bits['host'];
}
$url = Director::makeRelative($url); $url = Director::makeRelative($url);
} }