From 039aa3bc4e8d86505f4f8cba4e641a6229aba357 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Wed, 18 Dec 2013 18:11:47 -0500 Subject: server_event: addclient: wrapclient already calls startconnection for us [backported from trunk] --- net/server_event.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/server_event.lua b/net/server_event.lua index 0c3c4b04..2edc9a0c 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -97,7 +97,7 @@ function interface_mt:_close() return self:_destroy(); end -function interface_mt:_start_connection(plainssl) -- should be called from addclient +function interface_mt:_start_connection(plainssl) -- called from wrapclient local callback = function( event ) if EV_TIMEOUT == event then -- timeout during connection self.fatalerror = "connection timeout" @@ -730,7 +730,6 @@ local function addclient( addr, serverport, listener, pattern, sslctx, typ ) if res or ( err == "timeout" ) then local ip, port = client:getsockname( ) local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx ) - interface:_start_connection( sslctx ) debug( "new connection id:", interface.id ) return interface, err else -- cgit v1.2.3 From 86ece22c8cb2ffc73d8b22f7aa8a92bdb582a5f3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 6 Apr 2016 14:44:51 +0200 Subject: mod_websocket: Fix read timeout handler (thanks mt) --- plugins/mod_websocket.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua index 086eab62..a3f5318c 100644 --- a/plugins/mod_websocket.lua +++ b/plugins/mod_websocket.lua @@ -291,7 +291,10 @@ function handle_request(event) end local function keepalive(event) - return conn:write(build_frame({ opcode = 0x9, })); + local session = event.session; + if session.open_stream == session_open_stream then + return session.conn:write(build_frame({ opcode = 0x9, })); + end end module:hook("c2s-read-timeout", keepalive, -0.9); -- cgit v1.2.3