aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-30 13:30:53 +0200
committerKim Alvefur <zash@zash.se>2016-05-30 13:30:53 +0200
commit1b3f8491d969d4d8262b24379b774ee7a8057269 (patch)
treeb2f8c6e26bbff9f2127c8acaa140ab5f29d499ca /plugins/mod_s2s/mod_s2s.lua
parent6dbbb8fe6efc5a482d693860e5b716b3560f3739 (diff)
parentfac7477aad15120e671c2634fcf785fd2c135416 (diff)
downloadprosody-1b3f8491d969d4d8262b24379b774ee7a8057269.tar.gz
prosody-1b3f8491d969d4d8262b24379b774ee7a8057269.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index c4a3fe23..f5be4f27 100644
--- 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);