From 5ca94925e37a85e45e712084a18e3fab58c7ab6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Fri, 7 Jan 2022 18:05:17 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdf58326
---
 kiri-websocket-server/Server.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kiri-websocket-server/Server.php b/kiri-websocket-server/Server.php
index dc2d5897..4a8d11f6 100644
--- a/kiri-websocket-server/Server.php
+++ b/kiri-websocket-server/Server.php
@@ -79,7 +79,7 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
 	 * @return void
 	 * @throws Exception
 	 */
-	protected function protocol(Request $request, Response $response)
+	protected function setWebSocketProtocol(Request $request, Response $response)
 	{
 		$secWebSocketKey = $request->header['sec-websocket-key'];
 		$patten = '#^[+/0-9A-Za-z]{21}[AQgw]==$#';
@@ -99,8 +99,6 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
 		foreach ($headers as $key => $val) {
 			$response->header($key, $val);
 		}
-		$response->setStatusCode(101, 'connection success.');
-		$response->end();
 	}
 
 
@@ -111,10 +109,12 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
 	public function onHandshake(Request $request, Response $response): void
 	{
 		try {
+			$this->setWebSocketProtocol($request, $response);
 			if ($this->callback instanceof OnHandshakeInterface) {
 				$this->callback->onHandshake($request, $response);
 			} else {
-				$this->protocol($request, $response);
+				$response->setStatusCode(101, 'connection success.');
+				$response->end();
 			}
 			if ($this->callback instanceof OnOpenInterface) {
 				$this->callback->onOpen($this->server, $request);