Skip to content

Commit 385a491

Browse files
committed
we need to be specific about bytes here with Python 3.3+
1 parent 9e06d71 commit 385a491

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

ws4py/client/__init__.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,21 +310,24 @@ def process_handshake_header(self, headers):
310310
header = header.strip().lower()
311311
value = value.strip().lower()
312312

313-
if header == 'upgrade' and value != 'websocket':
313+
if header == b'upgrade' and value != b'websocket':
314314
raise HandshakeError("Invalid Upgrade header: %s" % value)
315315

316-
elif header == 'connection' and value != 'upgrade':
316+
elif header == b'connection' and value != b'upgrade':
317317
raise HandshakeError("Invalid Connection header: %s" % value)
318318

319-
elif header == 'sec-websocket-accept':
320-
match = b64encode(sha1(self.key.encode('utf-8') + WS_KEY).digest())
319+
elif header == b'sec-websocket-accept':
320+
match = b64encode(sha1(self.key + WS_KEY).digest())
321321
if value != match.lower():
322322
raise HandshakeError("Invalid challenge response: %s" % value)
323323

324-
elif header == 'sec-websocket-protocol':
324+
elif header == b'sec-websocket-protocol':
325325
protocols = ','.join(value)
326326

327-
elif header == 'sec-websocket-extensions':
327+
elif header == b'sec-websocket-extensions':
328328
extensions = ','.join(value)
329329

330330
return protocols, extensions
331+
332+
def handshake_ok(self):
333+
self.opened()

0 commit comments

Comments
 (0)