diff options
| author | Kim Alvefur <zash@zash.se> | 2017-09-14 02:48:34 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-09-14 02:48:34 +0200 |
| commit | 4c6c255113df008869577d4ec0291ff880b1273c (patch) | |
| tree | ae64d69a765500ad798ce354363683ab22571fa3 /plugins/mod_s2s/mod_s2s.lua | |
| parent | 4cfc3d05d585eca546786a0273243f97b70dd20d (diff) | |
| parent | 989c0783cb8fd86874f5f0bdcbdba30522e5fcb3 (diff) | |
| download | prosody-4c6c255113df008869577d4ec0291ff880b1273c.tar.gz prosody-4c6c255113df008869577d4ec0291ff880b1273c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index c2dd9900..b46b7e2a 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -438,16 +438,14 @@ function stream_callbacks.error(session, error, data) 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 ""); |