aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-01-26 15:27:19 +0100
committerKim Alvefur <zash@zash.se>2015-01-26 15:27:19 +0100
commita5b88cba341e0f99461b12d6dd42f54352c4b76a (patch)
treec658232ecea6713ee92d5ad4937203a4fe06a827
parent6f1ffa163d7e1624892aead18a400744750f29f8 (diff)
parentb21f268615f10ee6360dfb1f01af55fc35a02970 (diff)
downloadprosody-a5b88cba341e0f99461b12d6dd42f54352c4b76a.tar.gz
prosody-a5b88cba341e0f99461b12d6dd42f54352c4b76a.zip
Merge 0.10->trunk
-rw-r--r--core/stanza_router.lua2
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