# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1464607853 -7200
# Node ID 3ae19750cd4610916f622ffba6782fb1e99bf5d4
# Parent  843fe134453e885c7f3e21e287cc14c105dfbc2e# Parent  6943b1dd4e3d1c60de576923ccdc1490044c5ede
Merge 0.10->trunk

diff -r 843fe134453e -r 3ae19750cd46 core/stanza_router.lua
--- a/core/stanza_router.lua	Mon May 30 13:17:28 2016 +0200
+++ b/core/stanza_router.lua	Mon May 30 13:30:53 2016 +0200
@@ -62,7 +62,6 @@
 			return handle_unhandled_stanza(origin.host, origin, stanza);
 		end
 		if name == "iq" then
-			if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests
 			if not iq_types[st_type] or ((st_type == "set" or st_type == "get") and (#stanza.tags ~= 1)) then
 				origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children"));
 				return;
diff -r 843fe134453e -r 3ae19750cd46 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Mon May 30 13:17:28 2016 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Mon May 30 13:30:53 2016 +0200
@@ -437,9 +437,6 @@
 
 local function handleerr(err) log("error", "Traceback[s2s]: %s", traceback(tostring(err), 2)); end
 function stream_callbacks.handlestanza(session, stanza)
-	if stanza.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
-		stanza.attr.xmlns = nil;
-	end
 	stanza = session.filter("stanzas/in", stanza);
 	if stanza then
 		return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);