mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fixed lighttpd flushing bug
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42928 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
062c319000
commit
e54489c409
20
main.php
20
main.php
@ -43,6 +43,16 @@ foreach($envFiles as $envFile) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(isset($_GET['url'])) {
|
||||||
|
$url = $_GET['url'];
|
||||||
|
|
||||||
|
// Lighttpd uses this
|
||||||
|
} else {
|
||||||
|
list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
|
||||||
|
parse_str($query, $_GET);
|
||||||
|
if($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
|
||||||
|
}
|
||||||
|
|
||||||
if(ManifestBuilder::staleManifest()){
|
if(ManifestBuilder::staleManifest()){
|
||||||
ManifestBuilder::compileManifest();
|
ManifestBuilder::compileManifest();
|
||||||
}
|
}
|
||||||
@ -84,15 +94,7 @@ if(isset($_GET['debug_profile'])) Profiler::unmark('DB::connect');
|
|||||||
// Get the request URL
|
// Get the request URL
|
||||||
$baseURL = dirname(dirname($_SERVER['SCRIPT_NAME']));
|
$baseURL = dirname(dirname($_SERVER['SCRIPT_NAME']));
|
||||||
|
|
||||||
if(isset($_GET['url'])) {
|
|
||||||
$url = $_GET['url'];
|
|
||||||
|
|
||||||
// Lighttpd uses this
|
|
||||||
} else {
|
|
||||||
list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
|
|
||||||
parse_str($query, $_GET);
|
|
||||||
if($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(substr($url,0,strlen($baseURL)) == $baseURL) $url = substr($url,strlen($baseURL));
|
if(substr($url,0,strlen($baseURL)) == $baseURL) $url = substr($url,strlen($baseURL));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user