# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1459947034 -7200
# Node ID aa94cd27df4d144cf5a91a6b5e1c623434792a4f
# Parent  f8d37227acd7ffab6ad340c03aa7026a60fcb0c2# Parent  7dea28dafc494d813be6228f51cd3f443b3492a2
Merge 0.10->trunk

diff -r f8d37227acd7 -r aa94cd27df4d net/server_event.lua
--- a/net/server_event.lua	Tue Apr 05 20:54:43 2016 +0200
+++ b/net/server_event.lua	Wed Apr 06 14:50:34 2016 +0200
@@ -730,7 +730,6 @@
 	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 -r f8d37227acd7 -r aa94cd27df4d plugins/mod_websocket.lua
--- a/plugins/mod_websocket.lua	Tue Apr 05 20:54:43 2016 +0200
+++ b/plugins/mod_websocket.lua	Wed Apr 06 14:50:34 2016 +0200
@@ -291,7 +291,10 @@
 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);