Merge 0.9->0.10

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 0c0ef967eb734dc55a5dd7616d1112c023d32fe0..e6bf00188d2bccfa9a1eb70d44d833d2c60c7f00 100644 (file)
--- 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));