HTTP Upgrade and Connection must contain the WebSockets token but may also have other tokens

Lawouach · Lawouach · commit a47e320de9d6 · 2011-09-16T20:48:06.000+02:00
diff --git a/ws4py/server/cherrypyserver.py b/ws4py/server/cherrypyserver.py
@@ -127,7 +127,7 @@ def upgrade(self, protocols=None, extensions=None, version=8, handler_cls=WebSoc
             actual_value = request.headers.get(key)
             if not actual_value:
                 raise HandshakeError('Header %s is not defined' % key)
-            if expected_value and actual_value != expected_value:
+            if expected_value and expected_value not in actual_value:
                 raise HandshakeError('Illegal value for header %s: %s' %
                                      (key, actual_value))
             
diff --git a/ws4py/server/wsgi/middleware.py b/ws4py/server/wsgi/middleware.py
@@ -204,7 +204,7 @@ def __init__(self, handle, fallback_app=None, protocols=None, extensions=None,
     def __call__(self, environ, start_response):        
         # Initial handshake validation
         try:
-            if environ.get('upgrade.protocol') != 'websocket':
+            if 'websocket' not in environ.get('upgrade.protocol'):
                 raise HandshakeError("Upgrade protocol is not websocket")
             
             if environ.get('REQUEST_METHOD') != 'GET':
