Software / code / prosody
Changeset
7450:3ae19750cd46
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 30 May 2016 13:30:53 +0200 |
| parents | 7447:843fe134453e (current diff) 7449:6943b1dd4e3d (diff) |
| children | 7451:464a8a8de625 |
| files | plugins/mod_s2s/mod_s2s.lua |
| diffstat | 2 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Mon May 30 13:17:28 2016 +0200 +++ b/core/stanza_router.lua Mon May 30 13:30:53 2016 +0200 @@ -62,7 +62,6 @@ 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;
--- 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);
