as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-04-19 17:17:32 +08:00
parent 9604b9c1c5
commit 46aad644e8
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Events/OnHandshake.php
+9 -11
View File
@@ -96,13 +96,13 @@ class OnHandshake extends Callback
{ {
try { try {
$this->execute($request, $response); $this->execute($request, $response);
//
$clientInfo = Snowflake::getWebSocket()->getClientInfo($request->fd); // $clientInfo = Snowflake::getWebSocket()->getClientInfo($request->fd);
//
$event = Snowflake::app()->getEvent(); // $event = Snowflake::app()->getEvent();
//
$eventName = 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_HANDSHAKE; // $eventName = 'listen ' . $clientInfo['server_port'] . ' ' . Event::SERVER_HANDSHAKE;
$event->trigger($eventName, [$request, $response]); // $event->trigger($eventName, [$request, $response]);
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
$this->addError($exception, 'throwable'); $this->addError($exception, 'throwable');
$this->disconnect($response, 401); $this->disconnect($response, 401);
@@ -139,11 +139,9 @@ class OnHandshake extends Callback
$sRequest->parseUri(); $sRequest->parseUri();
if (($node = $router->find_path($sRequest)) === null) { if (($node = $router->find_path($sRequest)) === null) {
return $this->disconnect($response, 404); return $node->dispatch($sRequest, Response::create($response));
} }
Response::create($response); return $this->disconnect($response, 404);
return $node->dispatch($sRequest, \response());
} }
HttpServer/Route/Node.php
-1
View File
@@ -560,7 +560,6 @@ class Node extends HttpService
*/ */
private function runWith(): mixed private function runWith(): mixed
{ {
var_dump(func_get_args());
return ($this->callback)(...func_get_args()); return ($this->callback)(...func_get_args());
return call_user_func($this->callback, ...func_get_args()); return call_user_func($this->callback, ...func_get_args());