From b67be77f1ccca4653ae267eed5325a2a1d603ade Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 2 Feb 2016 16:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9Bcookie=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Cookie.php                    | 26 ++++++++++++++-------
 tests/thinkphp/library/think/cookieTest.php | 14 ++++++-----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/library/think/Cookie.php b/library/think/Cookie.php
index d8b5b5d5..bf4bd64a 100644
--- a/library/think/Cookie.php
+++ b/library/think/Cookie.php
@@ -16,17 +16,19 @@ class Cookie
 
     protected static $config = [
         // cookie 名称前缀
-        'prefix'   => '',
+        'prefix'    => '',
         // cookie 保存时间
-        'expire'   => 0,
+        'expire'    => 0,
         // cookie 保存路径
-        'path'     => '/',
+        'path'      => '/',
         // cookie 有效域名
-        'domain'   => '',
+        'domain'    => '',
         //  cookie 启用安全传输
-        'secure'   => false,
+        'secure'    => false,
         // httponly设置
-        'httponly' => '',
+        'httponly'  => '',
+        // 是否使用 setcookie
+        'setcookie' => true,
     ];
 
     /**
@@ -86,7 +88,9 @@ class Cookie
             $value = 'think:' . json_encode($value);
         }
         $expire = !empty($config['expire']) ? time() + intval($config['expire']) : 0;
-        setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+        if (self::$config['setcookie']) {
+            setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+        }
         $_COOKIE[$name] = $value;
     }
 
@@ -124,7 +128,9 @@ class Cookie
         $config = self::$config;
         $prefix = $prefix ? $prefix : $config['prefix'];
         $name   = $prefix . $name;
-        setcookie($name, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+        if (self::$config['setcookie']) {
+            setcookie($name, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+        }
         // 删除指定cookie
         unset($_COOKIE[$name]);
     }
@@ -148,7 +154,9 @@ class Cookie
             // 如果前缀为空字符串将不作处理直接返回
             foreach ($_COOKIE as $key => $val) {
                 if (0 === strpos($key, $prefix)) {
-                    setcookie($key, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+                    if (self::$config['setcookie']) {
+                        setcookie($key, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
+                    }
                     unset($_COOKIE[$key]);
                 }
             }
diff --git a/tests/thinkphp/library/think/cookieTest.php b/tests/thinkphp/library/think/cookieTest.php
index e340077d..88fa80a6 100644
--- a/tests/thinkphp/library/think/cookieTest.php
+++ b/tests/thinkphp/library/think/cookieTest.php
@@ -24,17 +24,19 @@ class cookieTest extends \PHPUnit_Framework_TestCase
 
     protected $default = [
         // cookie 名称前缀
-        'prefix'   => '',
+        'prefix'    => '',
         // cookie 保存时间
-        'expire'   => 0,
+        'expire'    => 0,
         // cookie 保存路径
-        'path'     => '/',
+        'path'      => '/',
         // cookie 有效域名
-        'domain'   => '',
+        'domain'    => '',
         //  cookie 启用安全传输
-        'secure'   => false,
+        'secure'    => false,
         // httponly设置
-        'httponly' => '',
+        'httponly'  => '',
+        // 是否使用 setcookie
+        'setcookie' => false,
     ];
 
     protected function setUp()