diff options
author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
commit | 763567fa0236b0b80e0271ed1d3325501b979ee1 (patch) | |
tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /net | |
parent | ff41d8ed2af5324b8f439a6864e41505ab778080 (diff) | |
parent | 29326acffa1d582bed7759e6302d2c4b4bced884 (diff) | |
download | prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.tar.gz prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r-- | net/http.lua | 2 |
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) |