diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-30 13:30:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-30 13:30:53 +0200 |
commit | 1b3f8491d969d4d8262b24379b774ee7a8057269 (patch) | |
tree | b2f8c6e26bbff9f2127c8acaa140ab5f29d499ca /core/stanza_router.lua | |
parent | 6dbbb8fe6efc5a482d693860e5b716b3560f3739 (diff) | |
parent | fac7477aad15120e671c2634fcf785fd2c135416 (diff) | |
download | prosody-1b3f8491d969d4d8262b24379b774ee7a8057269.tar.gz prosody-1b3f8491d969d4d8262b24379b774ee7a8057269.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/stanza_router.lua')
-rw-r--r-- | core/stanza_router.lua | 1 |
1 files changed, 0 insertions, 1 deletions
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; |