aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
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
commit73aae92a78fccd3327ac327ae6c1ef46b92e90cc (patch)
tree028c7d68e28e807e5b55504faeaa1cf3d6211aaf /plugins
parent503138ad403a2606eaeb60ae2236c3ce90c8acea (diff)
parentad3f7a961c28540805a905993b265ff3d9e0e292 (diff)
downloadprosody-73aae92a78fccd3327ac327ae6c1ef46b92e90cc.tar.gz
prosody-73aae92a78fccd3327ac327ae6c1ef46b92e90cc.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-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,