diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-12-11 00:19:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-12-11 00:19:15 +0000 |
| commit | d6e50241ad18826a16b95e9a1d0a5c7382d16a0a (patch) | |
| tree | 97d0d28f0107f5b136e961dc458bd738af9ca158 /plugins/mod_bosh.lua | |
| parent | 5ca4d27ae1488e11e07b3b797617fc83ce391a30 (diff) | |
| download | prosody-d6e50241ad18826a16b95e9a1d0a5c7382d16a0a.tar.gz prosody-d6e50241ad18826a16b95e9a1d0a5c7382d16a0a.zip | |
mod_bosh: Fixes to the session creation response - add mandatory 'wait' attribute, remove optional 'maxpause' which we don't support, and reformat the code to prevent long lines and wacky indentation. Fixes #219.
Diffstat (limited to 'plugins/mod_bosh.lua')
| -rw-r--r-- | plugins/mod_bosh.lua | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index d346f247..58254169 100644 --- 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; |