Merge 0.10->trunk

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 35e02fdf7d003f99373d32b8d274ac1ab33d541a..357b74520a4700e67d6d49b839327fe8bbc32361 100644 (file)
--- 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)