Changeset

2960:de405832bfb6

Merge 0.6/MattJ -> 0.6
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Apr 2010 22:26:14 +0100
parents 2959:62a3f824292a (diff) 2958:49d6bf241653 (current diff)
children 2961:db3c0ecce3f4 2967:c39ad633b26d
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_bosh.lua	Thu Apr 01 19:28:23 2010 +0500
+++ b/plugins/mod_bosh.lua	Sat Apr 03 22:26:14 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_tag = "http://jabber.org/protocol/httpbind\1body", default_ns = xmlns_bosh };
+local stream_callbacks = { stream_tag = "http://jabber.org/protocol/httpbind\1body", 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;
@@ -252,7 +252,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);