Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 14 Sep 2017 02:47:40 +0200
changeset 8237 97b3ca502547
parent 8234 97a094fdf101 (current diff)
parent 8236 4e7269c53659 (diff)
child 8238 7d9a2c200736
child 8245 177873dc9cf3
Merge 0.9->0.10
plugins/mod_c2s.lua file | annotate | diff | comparison | revisions
plugins/mod_component.lua file | annotate | diff | comparison | revisions
plugins/mod_s2s/mod_s2s.lua file | annotate | diff | comparison | revisions
plugins/mod_saslauth.lua file | annotate | diff | comparison | revisions
util/dependencies.lua file | annotate | diff | comparison | revisions 
--- 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 "");
--- 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 "");
--- 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 "");
prosody