From c78b8deea5f07d2616a5a2a4ba314c5c786df602 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 12 May 2017 15:24:37 +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 --- library/think/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/think/Response.php b/library/think/Response.php index fff782c6..96737dcd 100644 --- a/library/think/Response.php +++ b/library/think/Response.php @@ -53,7 +53,7 @@ class Response $this->options = array_merge($this->options, $options); } $this->contentType($this->contentType, $this->charset); - $this->header = $header; + $this->header = array_merge($this->header, $header); $this->code = $code; }