# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1422282439 -3600
# Node ID 6f39c58bdcc4d4d0db1be7ce06bfbf841c2fb241
# Parent  8aa967c81cbcfc4a1152b6554a9ca4f88e9c21f8# Parent  0ef7ca5276a15c47f2c5960993226dd3f8127b8e
Merge 0.10->trunk

diff -r 8aa967c81cbc -r 6f39c58bdcc4 core/stanza_router.lua
--- 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