aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-06 14:50:34 +0200
committerKim Alvefur <zash@zash.se>2016-04-06 14:50:34 +0200
commit26261c7a51d04fa39653c75c84b7e0566299d934 (patch)
treecd0b43a82194a0ef7608dc95c0bfe129d63df0af
parent888df39003d093377dac8e3a0cba7670d996bc07 (diff)
parent52a8bdb8f5a075f9de7f31b64522300a1e84ccfb (diff)
downloadprosody-26261c7a51d04fa39653c75c84b7e0566299d934.tar.gz
prosody-26261c7a51d04fa39653c75c84b7e0566299d934.zip
Merge 0.10->trunk
-rw-r--r--net/server_event.lua1
-rw-r--r--plugins/mod_websocket.lua5
2 files changed, 4 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 9e1ef50d..ba35ccdf 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -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
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);