Merge 0.9->0.10

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index ab9ec7b6c86f6b4e45c8d8457d0b74bc16ca1b1e..e6bf00188d2bccfa9a1eb70d44d833d2c60c7f00 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -72,6 +72,10 @@ function listener.ondisconnect(conn, err)
        requests[conn] = nil;
 end
 
+function listener.ondetach(conn)
+       requests[conn] = nil;
+end
+
 local function request_reader(request, data, err)
        if not request.parser then
                local function error_cb(reason)
@@ -171,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));