# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269974756 -3600
# Node ID 294c359a05f52e3c64c7837ea18a35089235d37b
# Parent  ff7f6668b34feb9820a94707963c540b8d9b6710# Parent  0250fba6be72550e3484fbac151e40f84d298a76
Merge 0.6->0.7

diff -r ff7f6668b34f -r 294c359a05f5 core/modulemanager.lua
--- a/core/modulemanager.lua	Thu Mar 25 19:34:41 2010 +0000
+++ b/core/modulemanager.lua	Tue Mar 30 19:45:56 2010 +0100
@@ -274,7 +274,7 @@
 		(handlers[1])(origin, stanza);
 		return true;
 	else
-		if stanza.attr.xmlns == "jabber:client" then
+		if stanza.attr.xmlns == nil then
 			log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
 			if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
 				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
diff -r ff7f6668b34f -r 294c359a05f5 core/s2smanager.lua
--- a/core/s2smanager.lua	Thu Mar 25 19:34:41 2010 +0000
+++ b/core/s2smanager.lua	Tue Mar 30 19:45:56 2010 +0100
@@ -68,7 +68,7 @@
 		for i, data in ipairs(sendq) do
 			local reply = data[2];
 			local xmlns = reply.attr.xmlns;
-			if not xmlns or xmlns == "jabber:client" or xmlns == "jabber:server" then
+			if not xmlns then
 				reply.attr.type = "error";
 				reply:tag("error", {type = "cancel"})
 					:tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
@@ -91,7 +91,7 @@
 	local host = hosts[from_host].s2sout[to_host];
 	if host then
 		-- We have a connection to this host already
-		if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
+		if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) then
 			(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
 			
 			-- Queue stanza until we are able to send it
diff -r ff7f6668b34f -r 294c359a05f5 core/stanza_router.lua
--- a/core/stanza_router.lua	Thu Mar 25 19:34:41 2010 +0000
+++ b/core/stanza_router.lua	Tue Mar 30 19:45:56 2010 +0100
@@ -23,9 +23,6 @@
 function core_process_stanza(origin, stanza)
 	(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
 
-	-- Currently we guarantee every stanza to have an xmlns, should we keep this rule?
-	if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end
-	
 	-- TODO verify validity of stanza (as well as JID validity)
 	if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
 	if stanza.name == "iq" then
@@ -36,7 +33,7 @@
 		end
 	end
 
-	if origin.type == "c2s" and stanza.attr.xmlns == "jabber:client" then
+	if origin.type == "c2s" and not stanza.attr.xmlns then
 		if not origin.full_jid
 			and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind"
 					and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
@@ -92,7 +89,7 @@
 		return; -- FIXME what should we do here?
 	end]] -- FIXME
 
-	if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == "jabber:client" then
+	if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == nil then
 		if origin.type == "s2sin" and not origin.dummy then
 			local host_status = origin.hosts[from_host];
 			if not host_status or not host_status.authed then -- remote server trying to impersonate some other server?
@@ -105,14 +102,14 @@
 		local h = hosts[stanza.attr.to or origin.host or origin.to_host];
 		if h then
 			local event;
-			if stanza.attr.xmlns == "jabber:client" then
+			if xmlns == nil then
 				if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get") then
 					event = "stanza/iq/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name;
 				else
 					event = "stanza/"..stanza.name;
 				end
 			else
-				event = "stanza/"..stanza.attr.xmlns..":"..stanza.name;
+				event = "stanza/"..xmlns..":"..stanza.name;
 			end
 			if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end
 		end
diff -r ff7f6668b34f -r 294c359a05f5 net/xmppserver_listener.lua
--- a/net/xmppserver_listener.lua	Thu Mar 25 19:34:41 2010 +0000
+++ b/net/xmppserver_listener.lua	Tue Mar 30 19:45:56 2010 +0100
@@ -50,6 +50,9 @@
 
 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
 function stream_callbacks.handlestanza(a, b)
+	if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
+		b.attr.xmlns = nil;
+	end
 	xpcall(function () core_process_stanza(a, b) end, handleerr);
 end