Merge 0.10->trunk

[prosody.git] / plugins / mod_s2s / mod_s2s.lua

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 431e712c94b5bd3279cba8cc0f547b019e13c9f7..f5be4f273341527ff59f0d81772a111dffc74c34 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -146,7 +146,7 @@ module:hook("s2s-read-timeout", keepalive, -1);
 
 function module.add_host(module)
        if module:get_option_boolean("disallow_s2s", false) then
-               module:log("warn", "The 'disallow_s2s' config option is deprecated, please see http://prosody.im/doc/s2s#disabling");
+               module:log("warn", "The 'disallow_s2s' config option is deprecated, please see https://prosody.im/doc/s2s#disabling");
                return nil, "This host has disallow_s2s set";
        end
        module:hook("route/remote", route_to_existing_session, -1);
@@ -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);