From 53dfab7fb71530d09f0b70031003e2bd63374a84 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Thu, 10 May 2012 22:10:01 -0500 Subject: [PATCH] Pull from websockify. Fix close code. --- utils/websocket.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/websocket.py b/utils/websocket.py index 71400285..d3bb48cb 100644 --- a/utils/websocket.py +++ b/utils/websocket.py @@ -362,7 +362,7 @@ Sec-WebSocket-Accept: %s\r if f['opcode'] == 0x08: 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: f['close_reason'] = f['payload'][2:] @@ -769,8 +769,6 @@ Sec-WebSocket-Accept: %s\r # Close the client _, exc, _ = sys.exc_info() if self.client: - print exc - print repr(exc.args) self.send_close(exc.args[0], exc.args[1]) except self.EClose: _, exc, _ = sys.exc_info()