aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 17:44:11 +0200
commit1792951a48e90ea7bf76d75690b9c0cc8e272beb (patch)
tree028c7d68e28e807e5b55504faeaa1cf3d6211aaf
parent277ee1b09d77a1e1dde4e6983e36d0c240956528 (diff)
parent7ec3aac1af0d965b32e71d760c02cc6a31a99655 (diff)
downloadprosody-1792951a48e90ea7bf76d75690b9c0cc8e272beb.tar.gz
prosody-1792951a48e90ea7bf76d75690b9c0cc8e272beb.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_bosh.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 6acdc23c..b65e7685 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -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,