Merge branch 'master' of github.com:kanaka/noVNC

2011-12-15 15:34:30 -06:00 · 2011-12-15 15:34:30 -06:00 · 86ebeef709
parent f2d856767d 2fa565b375
commit 86ebeef709
1 changed files with 1 additions and 1 deletions
--- a/utils/websocket.py
+++ b/utils/websocket.py
@ -586,7 +586,7 @@ Sec-WebSocket-Accept: %s\r
            sock.send(s2b(self.policy_response))
            raise self.EClose("Sending flash policy response")

-        elif handshake[0] in ("\x16", "\x80"):
+        elif handshake[0] in ("\x16", "\x80", 22, 128):
            # SSL wrap the connection
            if not ssl:
                raise self.EClose("SSL connection but no 'ssl' module")