Ŝelect websocket subprotocol; Issue #168

circuits · Jan 20, 2017 · 0947a45 · 0947a45
1 parent 4b1619a
commit 0947a45
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/circuits/web/websockets/dispatcher.py b/circuits/web/websockets/dispatcher.py
@@ -57,6 +57,7 @@ def _on_request(self, event, request, response):
         self._protocol_version = 13
         headers = request.headers
         sec_key = headers.get("Sec-WebSocket-Key", "").encode("utf-8")
+        subprotocols = headers.elements("Sec-WebSocket-Protocol")
 
         connection_tokens = [s.strip() for s in
                              headers.get("Connection", "").lower().split(",")]
@@ -88,13 +89,18 @@ def _on_request(self, event, request, response):
             response.headers["Upgrade"] = "WebSocket"
             response.headers["Connection"] = "Upgrade"
             response.headers["Sec-WebSocket-Accept"] = accept.decode()
+            if subprotocols:
+                response.headers["Sec-WebSocket-Protocol"] = self.select_subprotocol(subprotocols)
             codec = WebSocketCodec(request.sock, channel=self._wschannel)
             self._codecs[request.sock] = codec
             codec.register(self)
             return response
         finally:
             event.stop()
 
+    def select_subprotocol(self, subprotocols):
+        return subprotocols[0]
+
     @handler("response_complete")
     def _on_response_complete(self, e, value):
         response = e.args[0]