According to RFC 6455 websocket subprotocol preference order is

provided by client, not server
aio-libs · Jan 5, 2015 · c0e4490 · c0e4490
1 parent b4aaf76
commit c0e4490
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,6 +10,9 @@ CHANGES
 
 - add `aiohttp.web.WebSocketResponse`
 
+- According to RFC 6455 websocket subprotocol preference order is
+  provided by client, not server
+
 
 0.13.1 (12-31-2014)
 --------------------

diff --git a/aiohttp/websocket.py b/aiohttp/websocket.py
@@ -213,11 +213,11 @@ def do_handshake(method, headers, transport, protocols=()):
     # find common sub-protocol between client and server
     protocol = None
     if 'SEC-WEBSOCKET-PROTOCOL' in headers:
-        req_protocols = {str(proto.strip()) for proto in
-                         headers['SEC-WEBSOCKET-PROTOCOL'].split(',')}
+        req_protocols = [str(proto.strip()) for proto in
+                         headers['SEC-WEBSOCKET-PROTOCOL'].split(',')]
 
-        for proto in protocols:
-            if proto in req_protocols:
+        for proto in req_protocols:
+            if proto in protocols:
                 protocol = proto
                 break
         else:

diff --git a/tests/test_websocket.py b/tests/test_websocket.py
@@ -460,7 +460,7 @@ def test_handshake_protocol(self):
 
     def test_handshake_protocol_agreement(self):
         '''Tests if the right protocol is selected given multiple'''
-        best_proto = 'chat'
+        best_proto = 'worse_proto'
         wanted_protos = ['best', 'chat', 'worse_proto']
         server_protos = 'worse_proto,chat'