Changeset

6559:0ef7ca5276a1

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:25:16 +0100
parents 6556:74253c7beb9c (current diff) 6558:461217c45a18 (diff)
children 6560:6f39c58bdcc4 6561:bae84401a02c 6562:2b5ced5ca31f
files core/stanza_router.lua
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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