aboutsummaryrefslogtreecommitdiffstats
path: root/net/http.lua
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 /net/http.lua
parentd0cb0b35d5e1d3d12bf07610330c93e55eae086a (diff)
parent5d050ae1e6ad245debbc3f644680c99dd50932c5 (diff)
downloadprosody-29326acffa1d582bed7759e6302d2c4b4bced884.tar.gz
prosody-29326acffa1d582bed7759e6302d2c4b4bced884.zip
Merge 0.9->0.10
Diffstat (limited to 'net/http.lua')
-rw-r--r--net/http.lua2
1 files changed, 1 insertions, 1 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));