Merge 82e446e into fd77567

circuits · Jun 12, 2016 · 92d4e3d · 92d4e3d
2 parents fd77567 + 82e446e
commit 92d4e3d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/circuits/web/websockets/dispatcher.py b/circuits/web/websockets/dispatcher.py
@@ -57,7 +57,8 @@ def _on_request(self, event, request, response):
         self._protocol_version = 13
         headers = request.headers
         sec_key = headers.get("Sec-WebSocket-Key", "").encode("utf-8")
-
+        prot = headers.get("Sec-WebSocket-Protocol", "NONE")
+
         connection_tokens = [s.strip() for s in
                              headers.get("Connection", "").lower().split(",")]
 
@@ -88,6 +89,8 @@ def _on_request(self, event, request, response):
             response.headers["Upgrade"] = "WebSocket"
             response.headers["Connection"] = "Upgrade"
             response.headers["Sec-WebSocket-Accept"] = accept.decode()
+            response.headers["Sec-WebSocket-Protocol"] = prot  # We hear you
+
             codec = WebSocketCodec(request.sock, channel=self._wschannel)
             self._codecs[request.sock] = codec
             codec.register(self)