Software / code / prosody
Changeset
2170:2abca9cc78b1
Merge with 0.6
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 25 Nov 2009 15:41:04 +0000 |
| parents | 2166:fb01f0906564 (current diff) 2169:c06fdb6b57bd (diff) |
| children | 2171:c418f2ee3ead 2213:141896297cea |
| files | net/xmppclient_listener.lua util/dependencies.lua |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/xmppclient_listener.lua Wed Nov 25 03:30:41 2009 +0000 +++ b/net/xmppclient_listener.lua Wed Nov 25 15:41:04 2009 +0000 @@ -61,7 +61,7 @@ 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
--- a/util/dependencies.lua Wed Nov 25 03:30:41 2009 +0000 +++ b/util/dependencies.lua Wed Nov 25 15:41:04 2009 +0000 @@ -75,6 +75,11 @@ ["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"
