adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ServerShell not being able to handle plugin assets.

Browse source 
Fixes #3575
This commit is contained in:
mark_story 2013-01-28 22:21:58 -05:00
parent d3fdd2c911
commit 410981296c
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/webroot/index.php
View file

@ -24,6 +24,7 @@
if (!defined('DS')) { if (!defined('DS')) {
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
} }
/** /**
* These defines should only be edited if you have cake installed in * These defines should only be edited if you have cake installed in
* a directory layout other than the way it is distributed. * a directory layout other than the way it is distributed.
@ -72,6 +73,9 @@ if (!defined('WWW_ROOT')) {
// for built-in server // for built-in server
if (php_sapi_name() == 'cli-server') { if (php_sapi_name() == 'cli-server') {
if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) {
return false;
}
$_SERVER['PHP_SELF'] = '/' . basename(__FILE__); $_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
} }
@ -93,5 +97,6 @@ if (!empty($failed)) {
App::uses('Dispatcher', 'Routing'); App::uses('Dispatcher', 'Routing');
$Dispatcher = new Dispatcher(); $Dispatcher = new Dispatcher();
$Dispatcher->dispatch(new CakeRequest(), new CakeResponse()); $Dispatcher->dispatch(new CakeRequest(), new CakeResponse());

5
lib/Cake/Console/Command/ServerShell.php
View file

@ -125,10 +125,11 @@ class ServerShell extends AppShell {
return; return;
} }
$command = sprintf("php -S %s:%d -t %s", $command = sprintf("php -S %s:%d -t %s %s",
$this->_host, $this->_host,
$this->_port, $this->_port,
$this->_documentRoot $this->_documentRoot,
WEBROOT_DIR . '/index.php'
); );
$port = ($this->_port == self::DEFAULT_PORT) ? '' : ':' . $this->_port; $port = ($this->_port == self::DEFAULT_PORT) ? '' : ':' . $this->_port;

3
lib/Cake/Console/Templates/skel/webroot/index.php
View file

@ -74,6 +74,9 @@ if (!defined('WWW_ROOT')) {
// for built-in server // for built-in server
if (php_sapi_name() == 'cli-server') { if (php_sapi_name() == 'cli-server') {
if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['REQUEST_URI'])) {
return false;
}
$_SERVER['PHP_SELF'] = '/' . basename(__FILE__); $_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
} }