diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
| commit | 474f0d46466077959d3cff8ed4f51bebdda835db (patch) | |
| tree | 266e3395805b6fcea3d7a01dcda27037d2f09fb9 /plugins | |
| parent | af3bc714626c4e7b5299ef675bb244e963c1cfaa (diff) | |
| parent | 89e9f18d2ac62feb42a56a87ef0836a886da5d76 (diff) | |
| download | prosody-474f0d46466077959d3cff8ed4f51bebdda835db.tar.gz prosody-474f0d46466077959d3cff8ed4f51bebdda835db.zip | |
Merge 0.7->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_bosh.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 14cb1b91..02f3ce38 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -23,7 +23,7 @@ local logger = require "util.logger"; local log = logger.init("mod_bosh"); local xmlns_bosh = "http://jabber.org/protocol/httpbind"; -- (hard-coded into a literal in session.send) -local stream_callbacks = { stream_ns = "http://jabber.org/protocol/httpbind", stream_tag = "body", default_ns = xmlns_bosh }; +local stream_callbacks = { stream_ns = "http://jabber.org/protocol/httpbind", stream_tag = "body", default_ns = "jabber:client" }; 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; @@ -274,7 +274,7 @@ function stream_callbacks.handlestanza(request, stanza) local session = sessions[request.sid]; if session then if stanza.attr.xmlns == xmlns_bosh then - stanza.attr.xmlns = "jabber:client"; + stanza.attr.xmlns = nil; end session.ip = request.handler:ip(); core_process_stanza(session, stanza); |