Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Ratchet/Http/CloseResponseTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ private function close(ConnectionInterface $conn, $code = 400, array $additional
'X-Powered-By' => \Ratchet\VERSION
], $additional_headers));

$conn->send(gPsr\str($response));
// $conn->send(gPsr\str($response));
$conn->send(gPsr\Message::toString($response));
$conn->close();
}
}
3 changes: 2 additions & 1 deletion src/Ratchet/Http/HttpRequestParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public function isEom($message) {
* @return \Psr\Http\Message\RequestInterface
*/
public function parse($headers) {
return gPsr\parse_request($headers);
// return gPsr\parse_request($headers);
return gPsr\Message::parseRequest($headers);
}
}
6 changes: 4 additions & 2 deletions src/Ratchet/Http/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ public function onOpen(ConnectionInterface $conn, RequestInterface $request = nu
$parameters[$key] = $value;
}
}
$parameters = array_merge($parameters, gPsr\parse_query($uri->getQuery() ?: ''));
// $parameters = array_merge($parameters, gPsr\parse_query($uri->getQuery() ?: ''));
$parameters = array_merge($parameters, gPsr\Query::parse($uri->getQuery() ?: ''));

$request = $request->withUri($uri->withQuery(gPsr\build_query($parameters)));
// $request = $request->withUri($uri->withQuery(gPsr\build_query($parameters)));
$request = $request->withUri($uri->withQuery(gPsr\Query::build($parameters)));

$conn->controller = $route['_controller'];
$conn->controller->onOpen($conn, $request);
Expand Down