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 f05e2a95dd09af9906e5913e2959a7bdadc79c82..f5be4f273341527ff59f0d81772a111dffc74c34 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -56,6 +56,9 @@ local function bounce_sendq(session, reason)
                        (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", traceback());
                end;
                dummy = true;
+               close = function ()
+                       (session.log or log)("error", "Attempting to close the dummy origin of s2s error replies, please report this! Traceback: %s", traceback());
+               end;
        };
        for i, data in ipairs(sendq) do
                local reply = data[2];
@@ -143,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);