aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-10-26 20:57:06 +0100
committerKim Alvefur <zash@zash.se>2014-10-26 20:57:06 +0100
commit29326acffa1d582bed7759e6302d2c4b4bced884 (patch)
treec65d04b1647b92c2b09d1697a9c61d39485c1b09
parentd0cb0b35d5e1d3d12bf07610330c93e55eae086a (diff)
parent5d050ae1e6ad245debbc3f644680c99dd50932c5 (diff)
downloadprosody-29326acffa1d582bed7759e6302d2c4b4bced884.tar.gz
prosody-29326acffa1d582bed7759e6302d2c4b4bced884.zip
Merge 0.9->0.10
-rw-r--r--net/http.lua2
-rwxr-xr-xprosodyctl2
-rw-r--r--util/stanza.lua15
3 files changed, 4 insertions, 15 deletions
diff --git a/net/http.lua b/net/http.lua
index 0c0ef967..e6bf0018 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -175,7 +175,7 @@ function request(u, ex, callback)
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 --git a/prosodyctl b/prosodyctl
index 708aa09e..bfb118c3 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -552,7 +552,7 @@ function commands.about(arg)
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 --git a/util/stanza.lua b/util/stanza.lua
index 3d7caf8c..82601e63 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -202,19 +202,8 @@ end
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