# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1414353426 -3600
# Node ID 71b6e8b48a1288f8f4e30b503eb0df5268c8b8b5
# Parent  44df423f82901a99d06139f7c1ba0dc4b1a4aa1d# Parent  c1b06cda8b0daa81807976db4d7511cfc35ee936
Merge 0.9->0.10

diff -r 44df423f8290 -r 71b6e8b48a12 .hgtags
--- a/.hgtags	Sun Oct 26 16:29:50 2014 +0100
+++ b/.hgtags	Sun Oct 26 20:57:06 2014 +0100
@@ -53,3 +53,5 @@
 872ff4851c9b6cd662aac4b1a056ac2a97c85ce5 0.9.3
 5d73412aa1ba39081683ab922575eae93e4e867a 0.9.4
 8dee696c33cc5f7463c8b9e9fe806b9abd24c115 0.9.5
+e4b998ffc92249ea96716ab878f961f03769339d 0.9.6
+9030b056bd4a5b8402c9b1e1cd65dd35f046032f 0.9.7
diff -r 44df423f8290 -r 71b6e8b48a12 core/certmanager.lua
diff -r 44df423f8290 -r 71b6e8b48a12 net/http.lua
--- a/net/http.lua	Sun Oct 26 16:29:50 2014 +0100
+++ b/net/http.lua	Sun Oct 26 20:57:06 2014 +0100
@@ -175,7 +175,7 @@
 
 	local sslctx = false;
 	if using_https then
-		sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
+		sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
 	end
 
 	req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));
diff -r 44df423f8290 -r 71b6e8b48a12 prosodyctl
--- a/prosodyctl	Sun Oct 26 16:29:50 2014 +0100
+++ b/prosodyctl	Sun Oct 26 20:57:06 2014 +0100
@@ -552,7 +552,7 @@
 		print("  "..path);
 	end
 	print("");
-	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(luarocks.cfg.program_version or "2.x+")..")")
+	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")")
 		or (pcall(require, "luarocks.require") and "Installed (1.x)")
 		or "Not installed";
 	print("LuaRocks:        ", luarocks_status);
diff -r 44df423f8290 -r 71b6e8b48a12 util/stanza.lua
--- a/util/stanza.lua	Sun Oct 26 16:29:50 2014 +0100
+++ b/util/stanza.lua	Sun Oct 26 20:57:06 2014 +0100
@@ -202,19 +202,8 @@
 
 local xml_escape
 do
-	local escape_table = {
-		["'"] = "&apos;";
-		['"'] = "&quot;";
-		["<"] = "&lt;";
-		[">"] = "&gt;";
-		["&"] = "&amp;";
-		-- escape this whitespace because [\r\n\t] change into spaces in attributes
-		-- and \r\n changes into \n in text, and we want to preserve original bytes
-		["\t"] = "&#x9;";
-		["\n"] = "&#xA;";
-		["\r"] = "&#xD;";
-	};
-	function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end
+	local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
+	function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
 	_M.xml_escape = xml_escape;
 end