summaryrefslogtreecommitdiff
path: root/other/websocket.rb
diff options
context:
space:
mode:
authorPeter Åstrand (astrand) <astrand@cendio.se>2013-12-16 16:18:41 +0100
committerPeter Åstrand (astrand) <astrand@cendio.se>2013-12-16 16:18:41 +0100
commitf64e3dea51160f97c0b7297077aa8e05867bc6a1 (patch)
tree0b726142c0232a853c275335dc1a4af78636d598 /other/websocket.rb
parentdb933950617c14ef91490b3223a1f1cf848769a2 (diff)
parent17455afe4d9d1fa386c19080d7242067de26c5fc (diff)
downloadwebsockify-f64e3dea51160f97c0b7297077aa8e05867bc6a1.tar.gz
Merge remote branch 'upstream/master', after #110 was merged.
Diffstat (limited to 'other/websocket.rb')
-rw-r--r--other/websocket.rb2
1 files changed, 1 insertions, 1 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