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

Fixed sub-protocol negotiation support

Browse Source
This commit is contained in:
Chris Boden 2015-06-06 10:00:55 -04:00
parent d0d7b67ad7
commit 46487e756c
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,10 @@ class WsServer implements HttpServerInterface {
$encodingValidator = new \Ratchet\RFC6455\Encoding\Validator; $encodingValidator = new \Ratchet\RFC6455\Encoding\Validator;
$this->handshakeNegotiator = new \Ratchet\RFC6455\Handshake\Negotiator($encodingValidator); $this->handshakeNegotiator = new \Ratchet\RFC6455\Handshake\Negotiator($encodingValidator);
$this->messageStreamer = new \Ratchet\RFC6455\Messaging\Streaming\MessageStreamer($encodingValidator); $this->messageStreamer = new \Ratchet\RFC6455\Messaging\Streaming\MessageStreamer($encodingValidator);
if ($component instanceof WsServerInterface) {
$this->handshakeNegotiator->setSupportedSubProtocols($component->getSubProtocols());
}
} }
/** /**
@ -70,14 +74,6 @@ class WsServer implements HttpServerInterface {
$response = $this->handshakeNegotiator->handshake($request)->withHeader('X-Powered-By', \Ratchet\VERSION); $response = $this->handshakeNegotiator->handshake($request)->withHeader('X-Powered-By', \Ratchet\VERSION);
// Probably moved to RFC lib
// $subHeader = $conn->WebSocket->request->getHeader('Sec-WebSocket-Protocol');
// if (count($subHeader) > 0) {
// if ('' !== ($agreedSubProtocols = $this->getSubProtocolString($subHeader))) {
// $response = $response->withHeader('Sec-WebSocket-Protocol', $agreedSubProtocols);
// }
// }
$conn->send(gPsr\str($response)); $conn->send(gPsr\str($response));
if (101 != $response->getStatusCode()) { if (101 != $response->getStatusCode()) {
@ -141,35 +137,7 @@ class WsServer implements HttpServerInterface {
return $this; return $this;
} }
/** public function setStrictSubProtocolCheck($enable) {
* @param string $this->handshakeNegotiator->setStrictSubProtocolCheck($enable);
* @return boolean
*/
public function isSubProtocolSupported($name) {
if (!$this->isSpGenerated) {
if ($this->component instanceof WsServerInterface) {
$this->acceptedSubProtocols = array_flip($this->component->getSubProtocols());
}
$this->isSpGenerated = true;
}
return array_key_exists($name, $this->acceptedSubProtocols);
}
/**
* @param \Traversable|null $requested
* @return string
*/
protected function getSubProtocolString(\Traversable $requested = null) {
if (null !== $requested) {
foreach ($requested as $sub) {
if ($this->isSubProtocolSupported($sub)) {
return $sub;
}
}
}
return '';
} }
} }