faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

[WebSocket] Fixing name spacing and a bug

Browse Source 
Fixing the namespacing for the Guzzle response and the bug was the if statement should have been outside the loop.
This commit is contained in:
Mike Almond 2012-02-08 16:41:32 -05:00
parent f6fef1a390
commit f4c1cb110f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ratchet/Component/WebSocket/Version/Hixie76.php
View File

@ -34,7 +34,7 @@ class Hixie76 implements VersionInterface {
, 'Sec-WebSocket-Location' => 'ws://' . $request->getHeader('Host') . $request->getPath() , 'Sec-WebSocket-Location' => 'ws://' . $request->getHeader('Host') . $request->getPath()
); );
$response = new \Guzzle\Http\Message\Response('101', $headers, $body); $response = new Response('101', $headers, $body);
$response->setStatus('101', 'WebSocket Protocol Handshake'); $response->setStatus('101', 'WebSocket Protocol Handshake');
return $response; return $response;

2
src/Ratchet/Component/WebSocket/Version/RFC6455.php
View File

@ -41,7 +41,7 @@ class RFC6455 implements VersionInterface {
, 'Sec-WebSocket-Accept' => $this->sign($request->getHeader('Sec-WebSocket-Key')) , 'Sec-WebSocket-Accept' => $this->sign($request->getHeader('Sec-WebSocket-Key'))
); );
return new \Guzzle\Http\Message\Response('101', $headers); return new Response('101', $headers);
} }
/** /**

10
src/Ratchet/Component/WebSocket/WebSocketComponent.php
View File

@ -82,13 +82,13 @@ class WebSocketComponent implements MessageComponentInterface {
// This block is to be moved/changed later // This block is to be moved/changed later
$agreed_protocols = array(); $agreed_protocols = array();
$requested_protocols = $from->WebSocket->headers->getTokenizedHeader('Sec-WebSocket-Protocol', ','); $requested_protocols = $from->WebSocket->headers->getTokenizedHeader('Sec-WebSocket-Protocol', ',');
if (null !== $requested_protocols) {
foreach ($this->accepted_subprotocols as $sub_protocol) { foreach ($this->accepted_subprotocols as $sub_protocol) {
if (null !== $requested_protocols && false !== $requested_protocols->hasValue($sub_protocol)) { if (false !== $requested_protocols->hasValue($sub_protocol)) {
$agreed_protocols[] = $sub_protocol; $agreed_protocols[] = $sub_protocol;
}
} }
} }
if (count($agreed_protocols) > 0) { if (count($agreed_protocols) > 0) {
$response->setHeader('Sec-WebSocket-Protocol', implode(',', $agreed_protocols)); $response->setHeader('Sec-WebSocket-Protocol', implode(',', $agreed_protocols));
} }