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

Cleanup

Browse Source
This commit is contained in:
Chris Boden 2013-03-31 11:50:39 -04:00
parent 7e58dccdb7
commit 6140c94a33
3 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -8,6 +8,10 @@ CHANGELOG
--- ---
* 0.2.5 (2013-??-??)
* Fixed Hixie-76 handshake bug
* 0.2.4 (2013-03-09) * 0.2.4 (2013-03-09)
* Support for Symfony 2.2 and Guzzle 2.3 * Support for Symfony 2.2 and Guzzle 2.3

10
src/Ratchet/WebSocket/WsServer.php
View File

@ -88,7 +88,10 @@ class WsServer implements MessageComponentInterface {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function onMessage(ConnectionInterface $from, $msg) { public function onMessage(ConnectionInterface $from, $msg) {
if (true !== $from->WebSocket->established) { if (true === $from->WebSocket->established) {
return $from->WebSocket->version->onMessage($this->connections[$from], $msg);
}
if (isset($from->WebSocket->request)) { if (isset($from->WebSocket->request)) {
$from->WebSocket->request->getBody()->write($msg); $from->WebSocket->request->getBody()->write($msg);
} else { } else {
@ -113,13 +116,13 @@ class WsServer implements MessageComponentInterface {
} catch (\UnderflowException $e) { } catch (\UnderflowException $e) {
return; return;
} }
$response->setHeader('X-Powered-By', \Ratchet\VERSION);
// This needs to be refactored later on, incorporated with routing // This needs to be refactored later on, incorporated with routing
if ('' !== ($agreedSubProtocols = $this->getSubProtocolString($from->WebSocket->request->getTokenizedHeader('Sec-WebSocket-Protocol', ',')))) { if ('' !== ($agreedSubProtocols = $this->getSubProtocolString($from->WebSocket->request->getTokenizedHeader('Sec-WebSocket-Protocol', ',')))) {
$response->setHeader('Sec-WebSocket-Protocol', $agreedSubProtocols); $response->setHeader('Sec-WebSocket-Protocol', $agreedSubProtocols);
} }
$response->setHeader('X-Powered-By', \Ratchet\VERSION);
$from->send((string)$response); $from->send((string)$response);
if (101 != $response->getStatusCode()) { if (101 != $response->getStatusCode()) {
@ -135,9 +138,6 @@ class WsServer implements MessageComponentInterface {
return $this->_decorating->onOpen($upgraded); return $this->_decorating->onOpen($upgraded);
} }
$from->WebSocket->version->onMessage($this->connections[$from], $msg);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */