mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 06:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-04-20 00:41:49 +02:00
commit a7b9c6de42
5 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_bosh.lua
View file

@ -308,7 +308,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,
@ -384,6 +384,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;