diff options
| author | Kim Alvefur <zash@zash.se> | 2015-01-26 15:27:19 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-01-26 15:27:19 +0100 |
| commit | 887c81f09119032163fda9826df0e20d067c03e0 (patch) | |
| tree | c658232ecea6713ee92d5ad4937203a4fe06a827 /core | |
| parent | cd0dd3f92b02d855c98701792c179d02ad12bf24 (diff) | |
| parent | 26854f710c5d0c038738ddfda11406ce13a4536a (diff) | |
| download | prosody-887c81f09119032163fda9826df0e20d067c03e0.tar.gz prosody-887c81f09119032163fda9826df0e20d067c03e0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/stanza_router.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 4f529129..8e86b16f 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -63,7 +63,7 @@ function core_process_stanza(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 ~= "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 |