Merge 0.10->trunk

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index ab9ec7b6c86f6b4e45c8d8457d0b74bc16ca1b1e..357b74520a4700e67d6d49b839327fe8bbc32361 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -6,7 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local socket = require "socket"
 local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "net.http.parser".new;
@@ -72,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)
@@ -160,21 +163,17 @@ function request(u, ex, callback)
        end
        local port_number = port and tonumber(port) or (using_https and 443 or 80);
 
-       -- Connect the socket, and wrap it with net.server
-       local conn = socket.tcp();
-       conn:settimeout(10);
-       local ok, err = conn:connect(host, port_number);
-       if not ok and err ~= "timeout" then
-               callback(nil, 0, req);
-               return nil, err;
-       end
-
        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));
+       local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)
+       if not handler then
+               callback(nil, 0, req);
+               return nil, conn;
+       end
+       req.handler, req.conn = handler, conn
        req.write = function (...) return req.handler:write(...); end
 
        req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end