# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1259163664 0
# Node ID 2abca9cc78b1c134093f5cc9d8bf53c60e394e41
# Parent  fb01f090656497677503af10697e6e98d259d6ca# Parent  c06fdb6b57bd372ab40fb617344dcbeb7db8bfcb
Merge with 0.6

diff -r fb01f0906564 -r 2abca9cc78b1 net/xmppclient_listener.lua
--- 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
 		
diff -r fb01f0906564 -r 2abca9cc78b1 util/dependencies.lua
--- 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"