Commit 53dfab7f authored by Joel Martin's avatar Joel Martin

Pull from websockify. Fix close code.

parent bc28395a
...@@ -362,7 +362,7 @@ Sec-WebSocket-Accept: %s\r ...@@ -362,7 +362,7 @@ Sec-WebSocket-Accept: %s\r
if f['opcode'] == 0x08: if f['opcode'] == 0x08:
if f['length'] >= 2: if f['length'] >= 2:
f['close_code'] = unpack_from(">H", f['payload']) f['close_code'] = unpack_from(">H", f['payload'])[0]
if f['length'] > 3: if f['length'] > 3:
f['close_reason'] = f['payload'][2:] f['close_reason'] = f['payload'][2:]
...@@ -769,8 +769,6 @@ Sec-WebSocket-Accept: %s\r ...@@ -769,8 +769,6 @@ Sec-WebSocket-Accept: %s\r
# Close the client # Close the client
_, exc, _ = sys.exc_info() _, exc, _ = sys.exc_info()
if self.client: if self.client:
print exc
print repr(exc.args)
self.send_close(exc.args[0], exc.args[1]) self.send_close(exc.args[0], exc.args[1])
except self.EClose: except self.EClose:
_, exc, _ = sys.exc_info() _, exc, _ = sys.exc_info()
......
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