crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix byte/string conversion for Python 3.

This commit is contained in:
Kim Silkebækken 2011-09-10 21:45:48 +02:00
parent 6e263063c2
commit b8669546e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websocket.py
View File

@ -312,7 +312,7 @@ Sec-WebSocket-Accept: %s\r
offset=full_len - (f['length'] % 4), offset=full_len - (f['length'] % 4),
count=(f['length'] % 4)) count=(f['length'] % 4))
c = numpy.bitwise_xor(data, mask).tostring() c = numpy.bitwise_xor(data, mask).tostring()
f['payload'] = b + c f['payload'] = b + s2b(c)
else: else:
print("Unmasked frame: %s" % repr(buf)) print("Unmasked frame: %s" % repr(buf))
f['payload'] = buf[(f['hlen'] + has_mask * 4):full_len] f['payload'] = buf[(f['hlen'] + has_mask * 4):full_len]
@ -635,7 +635,7 @@ Sec-WebSocket-Accept: %s\r
# Generate the hash value for the accept header # Generate the hash value for the accept header
accept = b64encode(sha1(s2b(key + self.GUID)).digest()) accept = b64encode(sha1(s2b(key + self.GUID)).digest())
response = self.server_handshake_hybi % accept response = self.server_handshake_hybi % b2s(accept)
if self.base64: if self.base64:
response += "Sec-WebSocket-Protocol: base64\r\n" response += "Sec-WebSocket-Protocol: base64\r\n"
else: else: