Revert "改名"

This reverts commit fdf58326
This commit is contained in:
2022-01-07 18:05:17 +08:00
parent 0afa8fc400
commit 5ca94925e3
+4 -4
View File
@@ -79,7 +79,7 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
* @return void * @return void
* @throws Exception * @throws Exception
*/ */
protected function protocol(Request $request, Response $response) protected function setWebSocketProtocol(Request $request, Response $response)
{ {
$secWebSocketKey = $request->header['sec-websocket-key']; $secWebSocketKey = $request->header['sec-websocket-key'];
$patten = '#^[+/0-9A-Za-z]{21}[AQgw]==$#'; $patten = '#^[+/0-9A-Za-z]{21}[AQgw]==$#';
@@ -99,8 +99,6 @@ class Server extends AbstractServer implements OnHandshakeInterface, OnMessageIn
foreach ($headers as $key => $val) { foreach ($headers as $key => $val) {
$response->header($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 public function onHandshake(Request $request, Response $response): void
{ {
try { try {
$this->setWebSocketProtocol($request, $response);
if ($this->callback instanceof OnHandshakeInterface) { if ($this->callback instanceof OnHandshakeInterface) {
$this->callback->onHandshake($request, $response); $this->callback->onHandshake($request, $response);
} else { } else {
$this->protocol($request, $response); $response->setStatusCode(101, 'connection success.');
$response->end();
} }
if ($this->callback instanceof OnOpenInterface) { if ($this->callback instanceof OnOpenInterface) {
$this->callback->onOpen($this->server, $request); $this->callback->onOpen($this->server, $request);