Update webroot files to fix an issue in ServerShell.

The previous fixes done in 2918ae9 caused other issues preventing actions from being dispatched properly. Fixes #3934
cakephp · Jul 27, 2013 · c28cde4 · c28cde4
1 parent b345a8f
commit c28cde4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/webroot/index.php b/app/webroot/index.php
@@ -79,8 +79,7 @@
 
 // for built-in server
 if (php_sapi_name() == 'cli-server') {
-	$uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, '');
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) {
+	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);

diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php
@@ -79,8 +79,7 @@
 
 // for built-in server
 if (php_sapi_name() === 'cli-server') {
-	$uri = str_replace($_SERVER['SCRIPT_FILENAME'], WWW_ROOT, '');
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $uri)) {
+	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);