From 2d8b98ebaf28aef50b6d7162243a447f1b28da9c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 30 May 2016 13:29:43 +0200 Subject: core.stanza_router: Remove compatibility with Jabiru not including id attribute (originally added in 9b352c8a32e6) --- core/stanza_router.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 55c94bf4..fb30eef5 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -62,7 +62,6 @@ function core_process_stanza(origin, stanza) return handle_unhandled_stanza(origin.host, origin, stanza); end if name == "iq" then - if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests if not iq_types[st_type] or ((st_type == "set" or st_type == "get") and (#stanza.tags ~= 1)) then origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children")); return; -- cgit v1.2.3 From 9dc461298ae6f44f8e0072c7f6580b87aa672272 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 30 May 2016 13:30:32 +0200 Subject: mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2 --- plugins/mod_s2s/mod_s2s.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 16320ad1..f05e2a95 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -434,9 +434,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); -- cgit v1.2.3