From 4d537ad9fd564d558ebebb61606863b8e5418aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 27 Aug 2021 18:00:03 +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

---
 http-server/Message/Message.php | 15 ++++++++-------
 http-server/Message/Request.php |  4 +---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/http-server/Message/Message.php b/http-server/Message/Message.php
index fd7a8ef9..3d5f4197 100644
--- a/http-server/Message/Message.php
+++ b/http-server/Message/Message.php
@@ -85,15 +85,16 @@ trait Message
 	 */
 	private function parseRequestHeaders(\Swoole\Http\Request $request): static
 	{
-//		$index = strpos($request->getData(), "\r\n\r\n");
-//		$headers = explode("\r\n", substr($request->getData(), 0, $index));
-//
-//		array_shift($headers);
-		foreach ($request->header as $key => $value) {
+		$index = strpos($request->getData(), "\r\n\r\n");
+		$headers = explode("\r\n", substr($request->getData(), 0, $index));
+
+		array_shift($headers);
+		foreach ($request->header as $header) {
+			[$key, $value] = explode(': ', $header);
 			$this->addRequestHeader($key, $value);
 		}
-		$class = Kiri::getDi()->get(Headers::class);
-		$this->header = $class->withHeader($this->headers);
+//		$class = Kiri::getDi()->get(Headers::class);
+//		$this->header = $class->withHeader($this->headers);
 		return $this;
 	}
 
diff --git a/http-server/Message/Request.php b/http-server/Message/Request.php
index 54c47c3e..582e86c6 100644
--- a/http-server/Message/Request.php
+++ b/http-server/Message/Request.php
@@ -25,9 +25,6 @@ class Request implements RequestInterface
 	public string $method;
 
 
-	public Headers $header;
-
-
 	/**
 	 * @var Uri
 	 */
@@ -54,6 +51,7 @@ class Request implements RequestInterface
 	/**
 	 * @param \Swoole\Http\Request $request
 	 * @return RequestInterface
+	 * @throws ReflectionException
 	 */
 	public static function parseRequest(\Swoole\Http\Request $request): RequestInterface
 	{