# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1505350060 -7200
# Node ID 97b3ca502547de65bc775680e8e5cba75edc4e36
# Parent  97a094fdf101a4dd3a9347319e2280fa44c2fab9# Parent  4e7269c5365970f40046f076a83969c550084386
Merge 0.9->0.10

diff -r 97a094fdf101 -r 97b3ca502547 plugins/mod_c2s.lua
--- a/plugins/mod_c2s.lua	Tue Sep 12 14:59:52 2017 +0200
+++ b/plugins/mod_c2s.lua	Thu Sep 14 02:47:40 2017 +0200
@@ -111,16 +111,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 97a094fdf101 -r 97b3ca502547 plugins/mod_component.lua
--- a/plugins/mod_component.lua	Tue Sep 12 14:59:52 2017 +0200
+++ b/plugins/mod_component.lua	Thu Sep 14 02:47:40 2017 +0200
@@ -170,16 +170,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 97a094fdf101 -r 97b3ca502547 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Sep 12 14:59:52 2017 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Thu Sep 14 02:47:40 2017 +0200
@@ -422,16 +422,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 97a094fdf101 -r 97b3ca502547 plugins/mod_saslauth.lua
diff -r 97a094fdf101 -r 97b3ca502547 util/dependencies.lua