# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1492624978 -7200
# Node ID e24263db33800483a45925a14c50e04974dcb4ec
# Parent  dd3191974f2a365cb93217ccc9742b35caabc926# Parent  8d1fd6d34bda2d74872f402f66e35888e2e316b8
Merge 0.9->0.10

diff -r dd3191974f2a -r e24263db3380 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;