From 30f098040c0f9bd5b0f1908e5de238f95134e85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 16 Mar 2021 15:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HttpServer/Http/Response.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php
index bcc422a0..b23e354d 100644
--- a/HttpServer/Http/Response.php
+++ b/HttpServer/Http/Response.php
@@ -215,18 +215,13 @@ class Response extends HttpService
 	/**
 	 * @param $sendData
 	 * @param $status
-	 * @return mixed
+	 * @return string
 	 */
-	private function sendData($sendData, $status): mixed
+	private function sendData($sendData, $status): string
 	{
-		$this->response->status($status);
-		$this->response->header('Content-Type', $this->getContentType());
-		$this->response->header('Run-Time', $this->getRuntime());
-		if (!empty($sendData)) {
-			$this->response->end($this->headers($sendData));
-		} else {
-			$this->response->end();
-		}
+		$sendData = $this->setHeaders($status, $sendData);
+
+		$this->response->end($sendData);
 		$this->response = null;
 		unset($this->response);
 		return $sendData;
@@ -234,17 +229,21 @@ class Response extends HttpService
 
 
 	/**
+	 * @param $status
 	 * @param $sendData
 	 * @return string
 	 */
-	private function headers($sendData): string
+	private function setHeaders($status, $sendData): string
 	{
-		if (!empty($this->headers) && is_array($this->headers)) {
-			var_dump($this->headers);
-			foreach ($this->headers as $key => $header) {
-				$this->response->header($key, $header, true);
-			}
-			$this->headers = [];
+		$this->response->status($status);
+		$this->response->header('Content-Type', $this->getContentType());
+		$this->response->header('Run-Time', $this->getRuntime());
+
+		if (empty($this->headers) || !is_array($this->headers)) {
+			return $sendData == null ? '' : $sendData;
+		}
+		foreach ($this->headers as $key => $header) {
+			$this->response->header($key, $header, true);
 		}
 		return $sendData == null ? '' : $sendData;
 	}