diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-19 20:02:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-19 20:02:58 +0200 |
| commit | 71582ed712975252a9db4e99067ffdf048c6c419 (patch) | |
| tree | e52f761fb502153924cebccb346f39d132f20e90 | |
| parent | a3522c0f2d4a751b6c2809a82e431dc88190f657 (diff) | |
| parent | 02fb1f6f662e4bede4f676e4b8de8d80944ced65 (diff) | |
| download | prosody-71582ed712975252a9db4e99067ffdf048c6c419.tar.gz prosody-71582ed712975252a9db4e99067ffdf048c6c419.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/mod_bosh.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 494d11b0..5ef0dfb6 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -281,7 +281,7 @@ function stream_callbacks.streamopened(context, attr) -- 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 @@ function stream_callbacks.streamopened(context, attr) return; end + session.conn = request.conn; + if session.rid then local rid = tonumber(attr.rid); local diff = rid - session.rid; |