Skip to content

Commit 7fe6856

Browse files
committed
Merge branch 'master' into 3.0-merge
# Conflicts: # .github/workflows/test.yml # phpstan.neon # src/kafka/src/Producer.php # src/load-balancer/src/Node.php # src/retry/tests/RetryAnnotationAspectTest.php # src/session/src/Handler/FileHandler.php
2 parents c9ef8e2 + 61c7735 commit 7fe6856

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Server.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public function onHandShake($request, $response): void
114114
Context::set(WsContext::FD, $fd);
115115
$security = $this->container->get(Security::class);
116116

117-
$psr7Request = $this->initRequest($request);
118117
$psr7Response = $this->initResponse();
118+
$psr7Request = $this->initRequest($request);
119119

120120
$this->logger->debug(sprintf('WebSocket: fd[%d] start a handshake request.', $fd));
121121

0 commit comments

Comments
 (0)