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

Fixed lighty flushing bug

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.1.0@42779 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-09-28 04:26:38 +00:00 committed by Sam Minnee
parent 827540a99e
commit 657916aad1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.php
View File

@ -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()){
ManifestBuilder::compileManifest();
}
@ -83,15 +93,7 @@ if(isset($_GET['debug_profile'])) Profiler::unmark('DB::connect');
// Get the request URL
$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));