改进Response类send方法的异常处理

Author: liu21st

src/think/Response.php

@@ -12,6 +12,8 @@
 
 namespace think;
 
+use Throwable;
+
 /**
  * 响应输出基础类
  * @package think
@@ -127,29 +129,33 @@ public function setSession(Session $session)
      */
     public function send(): void
     {
-        // 处理输出数据
-        $data = $this->getContent();
-
-        if (!headers_sent()) {
-            if (!empty($this->header)) {
-                // 发送状态码
-                http_response_code($this->code);
-                // 发送头部信息
-                foreach ($this->header as $name => $val) {
-                    header($name . (!is_null($val) ? ':' . $val : ''));
+        try {
+            // 处理输出数据
+            $data = $this->getContent();
+            if (!headers_sent()) {
+                if (!empty($this->header)) {
+                    // 发送状态码
+                    http_response_code($this->code);
+                    // 发送头部信息
+                    foreach ($this->header as $name => $val) {
+                        header($name . (!is_null($val) ? ':' . $val : ''));
+                    }
                 }
-            }
 
-            if ($this->cookie) {
-                $this->cookie->save();
+                if ($this->cookie) {
+                    $this->cookie->save();
+                }
             }
-        }
 
-        $this->sendData($data);
+            $this->sendData($data);
 
-        if (function_exists('fastcgi_finish_request')) {
-            // 提高页面响应
-            fastcgi_finish_request();
+            if (function_exists('fastcgi_finish_request')) {
+                // 提高页面响应
+                fastcgi_finish_request();
+            }            
+        } catch (Throwable $e) {
+            // 继续执行，不中断响应发送
+            Container::getInstance()->log->error($e->getMessage());
         }
     }