mod_bosh: Fix handling of rids by not dropping requests with repeated rids (assign...

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 56e626804103c570f5a04f3169fefa23d54b25a0..ecce93cd091bad10485f210a6ac78cb885cf9a72 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -145,7 +145,7 @@ function stream_callbacks.streamopened(request, attr)
                
                -- New session
                sid = new_uuid();
-               local session = { type = "c2s_unauthed", conn = {}, sid = sid, rid = tonumber(attr.rid), host = attr.to, bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid, 
+               local session = { type = "c2s_unauthed", conn = {}, sid = sid, rid = tonumber(attr.rid)-1, host = attr.to, bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid, 
                                                bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
                                                requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, close = bosh_close_stream, 
                                                dispatch_stanza = core_process_stanza, log = logger.init("bosh"..sid), secure = request.secure };
@@ -212,8 +212,9 @@ function stream_callbacks.streamopened(request, attr)
                        session.log("warn", "rid too large (means a request was lost). Last rid: %d New rid: %s", session.rid, attr.rid);
                elseif diff <= 0 then
                        -- Repeated, ignore
-                       session.log("debug", "rid repeated (on request %s), ignoring: %d", request.id, session.rid);
+                       session.log("debug", "rid repeated (on request %s), ignoring: %s (diff %d)", request.id, session.rid, diff);
                        request.notopen = nil;
+                       request.sid = sid;
                        t_insert(session.requests, request);
                        return;
                end