mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

默认cli模式下REQUEST_METHOD为GET

Browse Source 
恢复route上一版本的改动。
This commit is contained in:
huangdijia
2015-12-28 09:21:37 +08:00
parent 73189bda4b
commit de04d32551
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base.php
View File

@@ -51,7 +51,7 @@ define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0);
define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0);
define('IS_AJAX', (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ? true : false);
define('NOW_TIME', $_SERVER['REQUEST_TIME_FLOAT']);
define('REQUEST_METHOD', IS_CLI ? '' : $_SERVER['REQUEST_METHOD']);
define('REQUEST_METHOD', IS_CLI ? 'GET' : $_SERVER['REQUEST_METHOD']);
define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false);

4
library/think/route.php
View File

@@ -237,11 +237,11 @@ class Route
}
// 获取当前请求类型的路由规则
$rules = isset(self::$rules[REQUEST_METHOD]) ? self::$rules[REQUEST_METHOD] : [];
$rules = self::$rules[REQUEST_METHOD];
if (!empty(self::$rules['*'])) {
// 合并任意请求的路由规则
$rules = array_merge(self::$rules['*'], (array) $rules);
$rules = array_merge(self::$rules['*'], $rules);
}
// 路由规则检测
if (!empty($rules)) {