Software /
code /
prosody
Diff
plugins/mod_s2s/mod_s2s.lua @ 10061:5c71693c8345
Merge 0.11->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 08 Jul 2019 02:44:32 +0200 |
parent | 9854:115b5e32d960 |
child | 10111:0f335815244f |
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua Mon Jul 08 02:46:27 2019 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Mon Jul 08 02:44:32 2019 +0200 @@ -595,8 +595,7 @@ if data then local ok, err = stream:feed(data); if ok then return; end - log("warn", "Received invalid XML: %s", data); - log("warn", "Problem was: %s", err); + log("debug", "Received invalid XML (%s) %d bytes: %q", tostring(err), #data, data:sub(1, 300)); session:close("not-well-formed"); end end @@ -739,6 +738,9 @@ listener = listener; default_port = 5269; encryption = "starttls"; + ssl_config = { -- FIXME This is not used atm, see mod_tls + verify = { "peer", "client_once", }; + }; multiplex = { pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:server%1.*>"; };