# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1505345256 -7200
# Node ID 4e7269c5365970f40046f076a83969c550084386
# Parent  176b7f4e4ac9148d007872092e0745e1ce6dbbce
mod_component, mod_s2s: Iterate over child tags instead of child nodes (can include text) in stream error (same as 176b7f4e4ac9)

diff -r 176b7f4e4ac9 -r 4e7269c53659 plugins/mod_component.lua
--- a/plugins/mod_component.lua	Wed Sep 13 18:18:57 2017 +0200
+++ b/plugins/mod_component.lua	Thu Sep 14 01:27:36 2017 +0200
@@ -151,16 +151,14 @@
 		session:close("not-well-formed");
 	elseif error == "stream-error" then
 		local condition, text = "undefined-condition";
-		for child in data:children() do
-			if child.attr.xmlns == xmlns_xmpp_streams then
-				if child.name ~= "text" then
-					condition = child.name;
-				else
-					text = child:get_text();
-				end
-				if condition ~= "undefined-condition" and text then
-					break;
-				end
+		for child in data:childtags(nil, xmlns_xmpp_streams) do
+			if child.name ~= "text" then
+				condition = child.name;
+			else
+				text = child:get_text();
+			end
+			if condition ~= "undefined-condition" and text then
+				break;
 			end
 		end
 		text = condition .. (text and (" ("..text..")") or "");
diff -r 176b7f4e4ac9 -r 4e7269c53659 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Wed Sep 13 18:18:57 2017 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Thu Sep 14 01:27:36 2017 +0200
@@ -416,16 +416,14 @@
 		session:close("not-well-formed");
 	elseif error == "stream-error" then
 		local condition, text = "undefined-condition";
-		for child in data:children() do
-			if child.attr.xmlns == xmlns_xmpp_streams then
-				if child.name ~= "text" then
-					condition = child.name;
-				else
-					text = child:get_text();
-				end
-				if condition ~= "undefined-condition" and text then
-					break;
-				end
+		for child in data:childtags(nil, xmlns_xmpp_streams) do
+			if child.name ~= "text" then
+				condition = child.name;
+			else
+				text = child:get_text();
+			end
+			if condition ~= "undefined-condition" and text then
+				break;
 			end
 		end
 		text = condition .. (text and (" ("..text..")") or "");