Merge Zash with Zash for Zash

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index a6c704e374a07e6a36ee370f5d893953e8caf619..6498f8fad59c3a083d5fc461558c2cf27d44d4a4 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -7,15 +7,12 @@
 --
 
 local socket = require "socket"
-local mime = require "mime"
+local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "util.httpstream".new;
 
 local server = require "net.server"
 
-local connlisteners_get = require "net.connlisteners".get;
-local listener = connlisteners_get("httpclient") or error("No httpclient listener!");
-
 local t_insert, t_concat = table.insert, table.concat;
 local pairs, ipairs = pairs, ipairs;
 local tonumber, tostring, xpcall, select, debug_traceback, char, format =
@@ -25,7 +22,53 @@ local log = require "util.logger".init("http");
 
 module "http"
 
-function urlencode(s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
+local requests = {}; -- Open requests
+
+local listener = { default_port = 80, default_mode = "*a" };
+
+function listener.onconnect(conn)
+       local req = requests[conn];
+       -- Send the request
+       local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
+       if req.query then
+               t_insert(request_line, 4, "?"..req.query);
+       end
+       
+       conn:write(t_concat(request_line));
+       local t = { [2] = ": ", [4] = "\r\n" };
+       for k, v in pairs(req.headers) do
+               t[1], t[3] = k, v;
+               conn:write(t_concat(t));
+       end
+       conn:write("\r\n");
+       
+       if req.body then
+               conn:write(req.body);
+       end
+end
+
+function listener.onincoming(conn, data)
+       local request = requests[conn];
+
+       if not request then
+               log("warn", "Received response from connection %s with no request attached!", tostring(conn));
+               return;
+       end
+
+       if data and request.reader then
+               request:reader(data);
+       end
+end
+
+function listener.ondisconnect(conn, err)
+       local request = requests[conn];
+       if request and request.conn then
+               request:reader(nil);
+       end
+       requests[conn] = nil;
+end
+
+function urlencode(s) return s and (s:gsub("[^a-zA-Z0-9.~_-]", function (c) return format("%%%02x", c:byte()); end)); end
 function urldecode(s) return s and (s:gsub("%%(%x%x)", function (c) return char(tonumber(c,16)); end)); end
 
 local function _formencodepart(s)
@@ -70,7 +113,7 @@ local function request_reader(request, data, startpos)
                local function success_cb(r)
                        if request.callback then
                                for k,v in pairs(r) do request[k] = v; end
-                               request.callback(r.body, r.code, request);
+                               request.callback(r.body, r.code, request, r);
                                request.callback = nil;
                        end
                        destroy_request(request);
@@ -111,14 +154,14 @@ function request(u, ex, callback)
        };
        
        if req.userinfo then
-               headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
+               headers["Authorization"] = "Basic "..b64(req.userinfo);
        end
 
        if ex then
                req.onlystatus = ex.onlystatus;
                body = ex.body;
                if body then
-                       method = "POST ";
+                       method = "POST";
                        headers["Content-Length"] = tostring(#body);
                        headers["Content-Type"] = "application/x-www-form-urlencoded";
                end
@@ -148,12 +191,11 @@ function request(u, ex, callback)
        req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", using_https and { mode = "client", protocol = "sslv23" });
        req.write = function (...) return req.handler:write(...); end
        
-       req.callback = function (content, code, request) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); 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
        req.reader = request_reader;
        req.state = "status";
 
-       listener.register_request(req.handler, req);
-
+       requests[req.handler] = req;
        return req;
 end