Rudimentary fix and testcase for Issue #179

Per RFC-6455 protocols and extensions values can contain multiple
values and may occur multiple times in the header.
This fix handles only the case of the ',' delimiter and not ';'.
Enhanced existing test to verify the most basic of parsing examples.

Author: Mark Edington

test/test_client.py

@@ -120,6 +120,9 @@ def test_connect_and_close(self, sock):
             b"Sec-Websocket-Version: 13",
             b"Content-Type: text/plain;charset=utf-8",
             b"Sec-Websocket-Accept: " + b64encode(sha1(c.key + WS_KEY).digest()),
+            b"Sec-WebSocket-Protocol: proto1, proto2",
+            b"Sec-WebSocket-Extensions: ext1, ext2",
+            b"Sec-WebSocket-Extensions: ext3",
             b"Upgrade: websocket",
             b"Date: Sun, 26 Jul 2015 12:32:55 GMT",
             b"Server: ws4py/test",
@@ -128,6 +131,8 @@ def test_connect_and_close(self, sock):
 
         c.connect()
         s.connect.assert_called_once_with(("127.0.0.1", 80))
+        self.assertEqual(c.protocols, [b'proto1', b'proto2'])
+        self.assertEqual(c.extensions, [b'ext1', b'ext2', b'ext3'])
 
         s.reset_mock()
         c.close(code=1006, reason="boom")
@@ -273,7 +278,6 @@ def test_thread_is_started_once_connected_secure(self):
         self.assertFalse(self.client._th.is_alive())
 
 
-
 if __name__ == '__main__':
     suite = unittest.TestSuite()
     loader = unittest.TestLoader()

ws4py/client/__init__.py

@@ -333,10 +333,10 @@ def process_handshake_header(self, headers):
                     raise HandshakeError("Invalid challenge response: %s" % value)
 
             elif header == b'sec-websocket-protocol':
-                protocols = ','.join(value)
+                protocols.extend([x.strip() for x in value.split(b',')])
 
             elif header == b'sec-websocket-extensions':
-                extensions = ','.join(value)
+                extensions.extend([x.strip() for x in value.split(b',')])
 
         return protocols, extensions