From aca956c4609d80402965d8961a45c49bd4205c9b Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 11 Mar 2016 22:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Response=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E5=A4=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Response.php                 | 2 +-
 tests/thinkphp/library/think/debugTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/think/Response.php b/library/think/Response.php
index aef1193d..4f985948 100644
--- a/library/think/Response.php
+++ b/library/think/Response.php
@@ -43,7 +43,7 @@ class Response
             'text'   => 'text/plain',
         ];
 
-        if (!headers_sent() && !headers_list() && isset($headers[$type])) {
+        if (!headers_sent() && isset($headers[$type])) {
             header('Content-Type:' . $headers[$type] . '; charset=utf-8');
         }
 
diff --git a/tests/thinkphp/library/think/debugTest.php b/tests/thinkphp/library/think/debugTest.php
index 10d787e9..3817dd48 100644
--- a/tests/thinkphp/library/think/debugTest.php
+++ b/tests/thinkphp/library/think/debugTest.php
@@ -77,7 +77,7 @@ class debugTest extends \PHPUnit_Framework_TestCase
     public function testGetUseTime()
     {
         $time = Debug::getUseTime();
-        $this->assertLessThan(5.5, $time);
+        $this->assertLessThan(10, $time);
     }
 
     /**