diff options
| author | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-12-16 16:18:41 +0100 |
|---|---|---|
| committer | Peter Åstrand (astrand) <astrand@cendio.se> | 2013-12-16 16:18:41 +0100 |
| commit | f64e3dea51160f97c0b7297077aa8e05867bc6a1 (patch) | |
| tree | 0b726142c0232a853c275335dc1a4af78636d598 | |
| parent | db933950617c14ef91490b3223a1f1cf848769a2 (diff) | |
| parent | 17455afe4d9d1fa386c19080d7242067de26c5fc (diff) | |
| download | websockify-f64e3dea51160f97c0b7297077aa8e05867bc6a1.tar.gz | |
Merge remote branch 'upstream/master', after #110 was merged.
| -rw-r--r-- | other/websocket.rb | 2 | ||||
| -rwxr-xr-x | other/websockify.rb | 2 | ||||
| -rwxr-xr-x | tests/echo.rb | 2 | ||||
| -rw-r--r-- | tests/test_websocketproxy.py | 2 | ||||
| -rw-r--r-- | websockify/websocket.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/other/websocket.rb b/other/websocket.rb index d4551a6..bb287ea 100644 --- a/other/websocket.rb +++ b/other/websocket.rb @@ -98,7 +98,7 @@ Sec-WebSocket-Accept: %s\r begin t[:client] = do_handshake(io) - new_client(t[:client]) + new_websocket_client(t[:client]) rescue EClose => e msg "Client closed: #{e.message}" return diff --git a/other/websockify.rb b/other/websockify.rb index d6310f3..e54d0dd 100755 --- a/other/websockify.rb +++ b/other/websockify.rb @@ -39,7 +39,7 @@ Traffic Legend: end # Echo back whatever is received - def new_client(client) + def new_websocket_client(client) msg "connecting to: %s:%s" % [@target_host, @target_port] tsock = TCPSocket.open(@target_host, @target_port) diff --git a/tests/echo.rb b/tests/echo.rb index 6a5493c..8db7dd3 100755 --- a/tests/echo.rb +++ b/tests/echo.rb @@ -12,7 +12,7 @@ require 'websocket' class WebSocketEcho < WebSocketServer # Echo back whatever is received - def new_client(client) + def new_websocket_client(client) cqueue = [] c_pend = 0 diff --git a/tests/test_websocketproxy.py b/tests/test_websocketproxy.py index 0fdd0fb..cf940ae 100644 --- a/tests/test_websocketproxy.py +++ b/tests/test_websocketproxy.py @@ -124,4 +124,4 @@ class WebSocketProxyTest(unittest.TestCase): return ins, outs, excepts self.stubs.Set(select, 'select', mock_select) - self.assertRaises(Exception, web_socket_proxy.new_client) + self.assertRaises(Exception, web_socket_proxy.new_websocket_client) diff --git a/websockify/websocket.py b/websockify/websocket.py index ac5184b..700b7d7 100644 --- a/websockify/websocket.py +++ b/websockify/websocket.py @@ -893,7 +893,7 @@ class WebSocketServer(object): """ Daemonize if requested. Listen for for connections. Run do_handshake() method for each connection. If the connection - is a WebSockets client then call new_client() method (which must + is a WebSockets client then call new_websocket_client() method (which must be overridden) for each new client connection. """ lsock = self.socket(self.listen_host, self.listen_port, False, |