From de04d32551ff84827f2d9cb6c519670b77c01f0c Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Mon, 28 Dec 2015 09:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4cli=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8BREQUEST=5FMETHOD=E4=B8=BAGET=20=E6=81=A2=E5=A4=8Droute?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=89=88=E6=9C=AC=E7=9A=84=E6=94=B9=E5=8A=A8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.php                | 2 +-
 library/think/route.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/base.php b/base.php
index d084f86d..61552823 100644
--- a/base.php
+++ b/base.php
@@ -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);
diff --git a/library/think/route.php b/library/think/route.php
index 45834d28..4bf7b327 100644
--- a/library/think/route.php
+++ b/library/think/route.php
@@ -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)) {