Hello community, here is the log from the commit of package prosody for openSUSE:Factory checked in at 2017-09-15 22:31:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prosody (Old) and /work/SRC/openSUSE:Factory/.prosody.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prosody" Fri Sep 15 22:31:39 2017 rev:6 rq:526286 version:0.9.12 Changes: -------- --- /work/SRC/openSUSE:Factory/prosody/prosody.changes 2017-09-11 16:23:37.069734512 +0200 +++ /work/SRC/openSUSE:Factory/.prosody.new/prosody.changes 2017-09-15 22:31:40.344413680 +0200 @@ -1,0 +2,10 @@ +Fri Sep 15 07:59:52 UTC 2017 - [email protected] + +- Update prosody-upstream-0.9-branch-fixes-since-0.12-tag.patch: + * mod_c2s: Iterate over child tags instead of child nodes in + stream error (fixes traceback from #987) + * mod_component, mod_s2s: Iterate over child tags instead of + child nodes (can include text) in stream error + (same as 176b7f4e4ac9) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prosody-upstream-0.9-branch-fixes-since-0.12-tag.patch ++++++ --- /var/tmp/diff_new_pack.YpSC3d/_old 2017-09-15 22:31:41.028317343 +0200 +++ /var/tmp/diff_new_pack.YpSC3d/_new 2017-09-15 22:31:41.028317343 +0200 @@ -364,3 +364,103 @@ _G.ssl = ssl; _G.ssl.context = require "ssl.context"; _G.ssl.x509 = softreq "ssl.x509"; +# HG changeset patch +# User Kim Alvefur <[email protected]> +# Date 1505319537 -7200 +# Wed Sep 13 18:18:57 2017 +0200 +# Node ID 176b7f4e4ac9148d007872092e0745e1ce6dbbce +# Parent 776789a98047b6ccd4c536c4da295ea78ff7e829 +mod_c2s: Iterate over child tags instead of child nodes in stream error (fixes traceback from #987) + +diff -r 776789a98047 -r 176b7f4e4ac9 plugins/mod_c2s.lua +--- a/plugins/mod_c2s.lua Tue Jul 25 13:25:49 2017 +0200 ++++ b/plugins/mod_c2s.lua Wed Sep 13 18:18:57 2017 +0200 +@@ -98,16 +98,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 ""); +# HG changeset patch +# User Kim Alvefur <[email protected]> +# Date 1505345256 -7200 +# Thu Sep 14 01:27:36 2017 +0200 +# 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 "");
