aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-10-26 20:58:02 +0100
committerKim Alvefur <zash@zash.se>2014-10-26 20:58:02 +0100
commitcebfb0bf3e29df5aac96cb0d41adb8e356921dc8 (patch)
tree014c49281af8df716e5b9e9de87e1c6472f91dcc /net
parentf08fe049ef978fdaa00132f238d6f038605ed3a1 (diff)
parent8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9 (diff)
downloadprosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.tar.gz
prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/http.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http.lua b/net/http.lua
index 35e02fdf..357b7452 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -165,7 +165,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
local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)