# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1422282316 -3600
# Node ID 0ef7ca5276a15c47f2c5960993226dd3f8127b8e
# Parent  74253c7beb9cdc3bef078565a52e8a218bd9ad6c# Parent  461217c45a18d3e2c1cca61d6f644cb74c5533e0
Merge 0.9->0.10

diff -r 74253c7beb9c -r 0ef7ca5276a1 core/stanza_router.lua
--- a/core/stanza_router.lua	Wed Jan 21 01:28:12 2015 +0000
+++ b/core/stanza_router.lua	Mon Jan 26 15:25:16 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