mod_bosh: Fixes to the session creation response - add mandatory 'wait' attribute...

diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index d346f247c428020d8fbeef02b9b9415c40036780..582541693915c5a11af373d25790234e44980519 100644 (file)
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -33,7 +33,6 @@ local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1;
 local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
 local BOSH_DEFAULT_POLLING = tonumber(module:get_option("bosh_max_polling")) or 5;
 local BOSH_DEFAULT_REQUESTS = tonumber(module:get_option("bosh_max_requests")) or 2;
-local BOSH_DEFAULT_MAXPAUSE = tonumber(module:get_option("bosh_max_pause")) or 300;
 
 local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
 
@@ -283,9 +282,17 @@ function stream_callbacks.streamopened(request, attr)
                fire_event("stream-features", session, features);
                --xmpp:version='1.0' xmlns:xmpp='urn:xmpp:xbosh'
                local response = st.stanza("body", { xmlns = xmlns_bosh,
-                                                                       inactivity = tostring(BOSH_DEFAULT_INACTIVITY), polling = tostring(BOSH_DEFAULT_POLLING), requests = tostring(BOSH_DEFAULT_REQUESTS), hold = tostring(session.bosh_hold), maxpause = "120",
-                                                                       sid = sid, authid = sid, ver  = '1.6', from = session.host, secure = 'true', ["xmpp:version"] = "1.0",
-                                                                       ["xmlns:xmpp"] = "urn:xmpp:xbosh", ["xmlns:stream"] = "http://etherx.jabber.org/streams" }):add_child(features);
+                       wait = attr.wait,
+                       inactivity = tostring(BOSH_DEFAULT_INACTIVITY),
+                       polling = tostring(BOSH_DEFAULT_POLLING),
+                       requests = tostring(BOSH_DEFAULT_REQUESTS),
+                       hold = tostring(session.bosh_hold),
+                       sid = sid, authid = sid,
+                       ver  = '1.6', from = session.host,
+                       secure = 'true', ["xmpp:version"] = "1.0",
+                       ["xmlns:xmpp"] = "urn:xmpp:xbosh",
+                       ["xmlns:stream"] = "http://etherx.jabber.org/streams"
+               }):add_child(features);
                request:send{ headers = default_headers, body = tostring(response) };
                
                request.sid = sid;