Pull from websockify. Fix close code.

This commit is contained in:
Joel Martin 2012-05-10 22:10:01 -05:00
parent bc28395abf
commit 53dfab7fb7
1 changed files with 1 additions and 3 deletions

View File

@ -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
# 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()