Skip to content

N
noVNC
Commit afecb839 authored by Joel Martin's avatar Joel Martin
Browse files
Options

Pull websockify: python3 numpy buffer/string fix. 

Pull from websockify 1c39c7f1f001.
parent 1150d0f7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
utils/websocket.py
View file @ afecb839
...@@ -295,7 +295,7 @@ Sec-WebSocket-Accept: %s\r ...@@ -295,7 +295,7 @@ Sec-WebSocket-Accept: %s\r
if has_mask: if has_mask:
# unmask payload # unmask payload
f['mask'] = buf[f['hlen']:f['hlen']+4] f['mask'] = buf[f['hlen']:f['hlen']+4]
b = c = '' b = c = s2b('')
if f['length'] >= 4: if f['length'] >= 4:
mask = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'), mask = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'),
offset=f['hlen'], count=1) offset=f['hlen'], count=1)
...@@ -635,7 +635,7 @@ Sec-WebSocket-Accept: %s\r ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment