Diff

plugins/mod_s2s/mod_s2s.lua @ 7450:3ae19750cd46

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 30 May 2016 13:30:53 +0200
parent 7359:a5a080c12c96
parent 7449:6943b1dd4e3d
child 7451:464a8a8de625
line wrap: on
line diff
--- 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);