prosody
db3c0ecce3f4
plugins/mod_bosh.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_bosh.lua @ 2961:db3c0ecce3f4

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Apr 2010 23:09:11 +0100
parent 2925:692b3c6c5bd2
parent 2959:62a3f824292a
child 3043:1fadbb2e3ca0
line wrap: on
line diff
--- a/plugins/mod_bosh.lua	Tue Mar 30 19:46:53 2010 +0100
+++ b/plugins/mod_bosh.lua	Sat Apr 03 23:09:11 2010 +0100
@@ -23,7 +23,7 @@
 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 @@
 	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);