diff options
| author | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-12-17 14:20:14 +0100 |
|---|---|---|
| committer | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-12-17 14:20:14 +0100 |
| commit | 6de69338191f39745b045ed8a6b9349735235090 (patch) | |
| tree | 327b4a650ed7fcbb872de61d309b778393afde8f | |
| parent | f46db483999c730f9abe76ea01fb2e8921483f38 (diff) | |
| download | websockify-6de69338191f39745b045ed8a6b9349735235090.tar.gz | |
Minor whitespace and layout tweaks, to reduce diff against
upstream/master.
| -rw-r--r-- | websockify/websocket.py | 7 | ||||
| -rwxr-xr-x | websockify/websocketproxy.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/websockify/websocket.py b/websockify/websocket.py index 700b7d7..889bc40 100644 --- a/websockify/websocket.py +++ b/websockify/websocket.py @@ -256,6 +256,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): return f + # # WebSocketRequestHandler logging/output functions # @@ -562,7 +563,8 @@ class WebSocketServer(object): def __init__(self, RequestHandlerClass, listen_host='', listen_port=None, source_is_ipv6=False, verbose=False, cert='', key='', ssl_only=None, - daemon=False, record='', web='', file_only=False, + daemon=False, record='', web='', + file_only=False, run_once=False, timeout=0, idle_timeout=0, traffic=False, tcp_keepalive=True, tcp_keepcnt=None, tcp_keepidle=None, tcp_keepintvl=None): @@ -809,7 +811,6 @@ class WebSocketServer(object): # Return the WebSockets socket which may be SSL wrapped return retsock - # # WebSocketServer logging/output functions # @@ -1024,6 +1025,6 @@ class WebSocketServer(object): # Restore signals for sig, func in original_signals.items(): - signal.signal(sig, func) + signal.signal(sig, func) diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py index e8bbf02..f51cc7c 100755 --- a/websockify/websocketproxy.py +++ b/websockify/websocketproxy.py @@ -31,7 +31,7 @@ Traffic Legend: } - Client receive }. - Client receive partial { - Target receive - + > - Target send >. - Target send partial < - Client send |