Software / code / prosody
Changeset
6560:6f39c58bdcc4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 26 Jan 2015 15:27:19 +0100 |
| parents | 6557:8aa967c81cbc (current diff) 6559:0ef7ca5276a1 (diff) |
| children | 6571:4a864b6e8963 6572:c60c199cc7f0 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Wed Jan 21 01:29:00 2015 +0000 +++ b/core/stanza_router.lua Mon Jan 26 15:27:19 2015 +0100 @@ -63,7 +63,7 @@ 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 ~= "result" and #stanza.tags ~= 1) then + 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; end
