Merge 0.10->trunk

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 55c94bf4b51261ebf897f238c3de0c9cede45c3e..fb30eef5a6971e4d74905d8c52cace5d5d3fba2b 100644 (file)
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -62,7 +62,6 @@ function core_process_stanza(origin, stanza)
                        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 --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index c4a3fe23b0a038f6a1af24d7d07442bf578ac192..f5be4f273341527ff59f0d81772a111dffc74c34 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -437,9 +437,6 @@ end
 
 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);