Merge 0.10->trunk

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index b87c9396473f2c337dc33cf567ce91b670742a21..357b74520a4700e67d6d49b839327fe8bbc32361 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -71,6 +71,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)
@@ -161,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)