NEW: Added support for PHP 5.4's built-in webserver.

PHP 5.4 comes with a built-in webserver.  This addition to main.php adds support for it.  It is designed to be run like so:

php -S localhost:3000 framework/main.php

The router will pass access of any file back to the built-in webserver, and handle all other URLs.
This commit is contained in:
Sam Minnee 2012-09-11 11:49:42 +12:00
parent 5bf2212b22
commit 1005571163

View File

@ -63,8 +63,22 @@ if(!empty($_SERVER['HTTP_X_ORIGINAL_URL'])) {
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL']; $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
} }
// PHP 5.4's built-in webserver uses this
if (php_sapi_name() == 'cli-server') {
$url = $_SERVER['REQUEST_URI'];
// Querystring args need to be explicitly parsed
if(strpos($url,'?') !== false) {
list($url, $query) = explode('?',$url,2);
parse_str($query, $_GET);
if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
}
// Pass back to the webserver for files that exist
if(file_exists(BASE_PATH . $url)) return false;
// Apache rewrite rules use this // Apache rewrite rules use this
if (isset($_GET['url'])) { } else if (isset($_GET['url'])) {
$url = $_GET['url']; $url = $_GET['url'];
// IIS includes get variables in url // IIS includes get variables in url
$i = strpos($url, '?'); $i = strpos($url, '?');
@ -109,4 +123,4 @@ DB::connect($databaseConfig);
// Direct away - this is the "main" function, that hands control to the appropriate controller // Direct away - this is the "main" function, that hands control to the appropriate controller
DataModel::set_inst(new DataModel()); DataModel::set_inst(new DataModel());
Director::direct($url, DataModel::inst()); Director::direct($url, DataModel::inst());