diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-11-25 15:41:04 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-11-25 15:41:04 +0000 |
| commit | 21fdef824cc0bbfa1b4bc2de7a3f8e8175af7c5a (patch) | |
| tree | 0b2e4a6c85a2b227467df7cda8f282526531c4aa | |
| parent | fc220d6217b14bb08eb59dd50b5e8319f63a3290 (diff) | |
| parent | 38e55888e5c0a041f876281cfeb6230be406c7c3 (diff) | |
| download | prosody-21fdef824cc0bbfa1b4bc2de7a3f8e8175af7c5a.tar.gz prosody-21fdef824cc0bbfa1b4bc2de7a3f8e8175af7c5a.zip | |
Merge with 0.6
| -rw-r--r-- | net/xmppclient_listener.lua | 2 | ||||
| -rw-r--r-- | util/dependencies.lua | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 4fd51db6..223fa89b 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -61,7 +61,7 @@ local function session_reset_stream(session) function session.data(conn, data) local ok, err = parser:parse(data); if ok then return; end - log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " ")); + log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")); session:close("xml-not-well-formed"); end diff --git a/util/dependencies.lua b/util/dependencies.lua index 06f742e4..b1d02921 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -75,6 +75,11 @@ if not ssl then ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; }, "SSL/TLS support will not be available"); end +else + local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)"); + if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then + log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends"); + end end local encodings, err = softreq "util.encodings" |