From 9d0424d34f7e91b0aefa0bae40c9921804c6820d Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 24 May 2016 16:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/base.php b/base.php
index 118d3ac6..f12ae4ac 100644
--- a/base.php
+++ b/base.php
@@ -48,5 +48,7 @@ defined('CLASS_APPEND_SUFFIX') or define('CLASS_APPEND_SUFFIX', false); // 是
 defined('APP_MODE') or define('APP_MODE', function_exists('saeAutoLoader') ? 'sae' : 'common');
 
 // 环境常量
+define('IS_CGI', strpos(PHP_SAPI, 'cgi') === 0 ? 1 : 0);
+define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0);
 define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0);
 define('IS_MAC', strstr(PHP_OS, 'Darwin') ? 1 : 0);
diff --git a/library/think/App.php b/library/think/App.php
index 6111d8cf..47b0c92c 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -48,8 +48,6 @@ class App
         define('IS_DELETE', REQUEST_METHOD == 'DELETE' ? true : false);
         define('IS_AJAX', $request->isAjax());
         define('__EXT__', $request->ext());
-        define('IS_CGI', $request->isCgi());
-        define('IS_CLI', $request->isCli());
 
         // 初始化应用（公共模块）
         $config = self::initModule(COMMON_MODULE, Config::get());