diff plugins/mod_websocket.lua @ 7341:aa94cd27df4d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 06 Apr 2016 14:50:34 +0200
parents 7dea28dafc49
children 779a9ef6b4fd
line wrap: on
line diff
--- 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);