From 9db261e601a6c4e73ec2d58f54768b438a8c29a5 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 24 Nov 2016 15:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=AF=B7=E6=B1=82=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Response.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/library/think/Response.php b/library/think/Response.php
index a202ce76..2b84ed17 100644
--- a/library/think/Response.php
+++ b/library/think/Response.php
@@ -103,6 +103,16 @@ class Response
             Debug::inject($this, $data);
         }
 
+        if (200 == $this->code) {
+            $cache = Request::instance()->getCache();
+            if ($cache) {
+                $this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate';
+                $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
+                $this->header['Expires']       = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT';
+                Cache::set($cache[0], [$data, $this->header], $cache[1]);
+            }
+        }
+
         if (!headers_sent() && !empty($this->header)) {
             // 发送状态码
             http_response_code($this->code);
@@ -111,16 +121,7 @@ class Response
                 header($name . ':' . $val);
             }
         }
-        if (200 == $this->code) {
-            $cache = Request::instance()->getCache();
-            if ($cache) {
-                header('Cache-Control: max-age=' . $cache[1] . ',must-revalidate');
-                header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
-                header('Expires:' . gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT');
-                $header['Content-Type'] = $this->header['Content-Type'];
-                Cache::set($cache[0], [$data, $header], $cache[1]);
-            }
-        }
+
         echo $data;
 
         if (function_exists('fastcgi_finish_request')) {