Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 19 Apr 2017 20:02:58 +0200
changeset 8100 e24263db3380
parent 8099 dd3191974f2a (current diff)
parent 8096 8d1fd6d34bda (diff)
child 8101 ee1c81450345
Merge 0.9->0.10
plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Wed Apr 19 19:31:46 2017 +0200
+++ b/plugins/mod_bosh.lua	Wed Apr 19 20:02:58 2017 +0200
@@ -281,7 +281,7 @@
 		-- New session
 		sid = new_uuid();
 		local session = {
-			type = "c2s_unauthed", conn = {}, sid = sid, rid = rid, host = attr.to,
+			type = "c2s_unauthed", conn = request.conn, sid = sid, rid = rid, host = attr.to,
 			bosh_version = attr.ver, bosh_wait = wait, streamid = sid,
 			bosh_max_inactive = bosh_max_inactivity,
 			requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream,
@@ -353,6 +353,8 @@
 		return;
 	end
 
+	session.conn = request.conn;
+
 	if session.rid then
 		local rid = tonumber(attr.rid);
 		local diff = rid - session.rid;