diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:24:57 +0000 |
commit | 85acc757991e3a425e8d8cab4611c7c321dc8425 (patch) | |
tree | f7d0930c79494da535857eaf4f2a976bb052fa35 /net/http.lua | |
parent | 25d886be280a1b6d9965b38cb22aa328354de0c2 (diff) | |
parent | f3797f8dc8d711759fa4bf93a3a13f4dadbfdd7a (diff) | |
download | prosody-85acc757991e3a425e8d8cab4611c7c321dc8425.tar.gz prosody-85acc757991e3a425e8d8cab4611c7c321dc8425.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/http.lua')
-rw-r--r-- | net/http.lua | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/net/http.lua b/net/http.lua index e6bf0018..357b7452 100644 --- 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; @@ -164,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", "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 |