From 7de975ab349bbd6e98265c7932a3ce7b86365341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 20 Apr 2021 12:15:15 +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/Events/OnHandshake.php | 14 ++++++++------
 HttpServer/Http/Response.php      |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php
index f2676cd1..c32a0e87 100644
--- a/HttpServer/Events/OnHandshake.php
+++ b/HttpServer/Events/OnHandshake.php
@@ -121,10 +121,10 @@ class OnHandshake extends Callback
 
 		$router = Snowflake::app()->getRouter();
 
-		$sRequest = $this->sRequest($request);
+		[$sRequest, $sResponse] = $this->sRequest($request, $response);
 
 		if (($node = $router->find_path($sRequest)) !== null) {
-			return $node->dispatch($sRequest, Response::create($response));
+			return $node->dispatch($sRequest, $sResponse);
 		}
 		return $this->disconnect($response, 404);
 	}
@@ -132,11 +132,12 @@ class OnHandshake extends Callback
 
 	/**
 	 * @param $request
-	 * @return Request
-	 * @throws ReflectionException
+	 * @param SResponse $response
+	 * @return array
 	 * @throws NotFindClassException
+	 * @throws ReflectionException
 	 */
-	private function sRequest($request): Request
+	private function sRequest($request, SResponse $response): array
 	{
 		/** @var Request $sRequest */
 		$sRequest = Request::create($request);
@@ -150,7 +151,8 @@ class OnHandshake extends Callback
 		$sRequest->params = new HttpParams([], $request->get, []);
 
 		$sRequest->parseUri();
-		return $sRequest;
+
+		return [$sRequest, Response::create($response)];
 	}
 
 
diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php
index f68be584..3182a24b 100644
--- a/HttpServer/Http/Response.php
+++ b/HttpServer/Http/Response.php
@@ -279,7 +279,8 @@ class Response extends HttpService
 		$ciResponse->response = $response;
 		$ciResponse->startTime = microtime(true);
 		$ciResponse->format = self::JSON;
-		return Context::setContext('response', $ciResponse);
+		Context::setContext('response', $ciResponse);
+		return $ciResponse;
 	}