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

2013-07-20 12:38:23 -04:00 · 2013-07-20 12:38:23 -04:00 · bb0896ab12
commit bb0896ab12
parent e9d19c95ab
1 changed files with 6 additions and 10 deletions
--- a/WsServer.php
+++ b/WsServer.php
@ -199,19 +199,15 @@ class WsServer implements HttpServerInterface {
     * @return string
     */
    protected function getSubProtocolString(\Traversable $requested = null) {
-        if (null === $requested) {
-            return '';
-        }
-
-        $result = array();
-
-        foreach ($requested as $sub) {
-            if ($this->isSubProtocolSupported($sub)) {
-                $result[] = $sub;
+        if (null !== $requested) {
+            foreach ($requested as $sub) {
+                if ($this->isSubProtocolSupported($sub)) {
+                    return $sub;
+                }
            }
        }

-        return implode(',', $result);
+        return '';
    }

    /**