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

[WebSocket] Only select one sub-protocol, fixes #103

Browse Source
This commit is contained in:
Chris Boden 2013-07-20 12:38:23 -04:00
parent 9a50835637
commit 5676161277
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,19 +199,15 @@ class WsServer implements HttpServerInterface {
* @return string * @return string
*/ */
protected function getSubProtocolString(\Traversable $requested = null) { protected function getSubProtocolString(\Traversable $requested = null) {
if (null === $requested) { if (null !== $requested) {
return ''; foreach ($requested as $sub) {
} if ($this->isSubProtocolSupported($sub)) {
return $sub;
$result = array(); }
foreach ($requested as $sub) {
if ($this->isSubProtocolSupported($sub)) {
$result[] = $sub;
} }
} }
return implode(',', $result); return '';
} }
/** /**

3
tests/unit/WebSocket/WsServerTest.php
View File

@ -27,10 +27,11 @@ class WsServerTest extends \PHPUnit_Framework_TestCase {
public function protocolProvider() { public function protocolProvider() {
return array( return array(
array('hello,world', array('hello', 'world'), array('hello', 'world')) array('hello', array('hello', 'world'), array('hello', 'world'))
, array('', array('hello', 'world'), array('wamp')) , array('', array('hello', 'world'), array('wamp'))
, array('', array(), null) , array('', array(), null)
, array('wamp', array('hello', 'wamp', 'world'), array('herp', 'derp', 'wamp')) , array('wamp', array('hello', 'wamp', 'world'), array('herp', 'derp', 'wamp'))
, array('wamp', array('wamp'), array('wamp'))
); );
} }