Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-04-19 17:44:11 +02:00
commit 1792951a48

View file

@ -287,7 +287,7 @@ function stream_callbacks.streamopened(context, attr)
-- New session
sid = new_uuid();
local session = {
type = "c2s_unauthed", conn = {}, sid = sid, rid = rid-1, host = attr.to,
type = "c2s_unauthed", conn = {}, sid = sid, rid = rid, host = attr.to,
bosh_version = attr.ver, bosh_wait = wait, streamid = sid,
bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream,