From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 May 2016 11:30:53 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=2b1dc0cc310168a2272e6e57268e1cae6f01af3c;hp=-c;p=prosody.git

Merge 0.10->trunk
---

2b1dc0cc310168a2272e6e57268e1cae6f01af3c
diff --combined plugins/mod_s2s/mod_s2s.lua
index c4a3fe23,f05e2a95..f5be4f27
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@@ -56,9 -56,6 +56,9 @@@ local function bounce_sendq(session, re
  			(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];
@@@ -146,7 -143,7 +146,7 @@@ module:hook("s2s-read-timeout", keepali
  
  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 -434,6 +437,6 @@@ en
  
  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);