aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-01-23 17:19:16 +0000
committerMatthew Wild <mwild1@gmail.com>2012-01-23 17:19:16 +0000
commit40423517a9c43d7e9c8c8879110ed03fe7aa28a9 (patch)
tree384503c71321e4f87bb2d26de21c40a2e24920f4
parent494c61264c4bc9bce278d20a92685b78c68d2e4b (diff)
downloadprosody-40423517a9c43d7e9c8c8879110ed03fe7aa28a9.tar.gz
prosody-40423517a9c43d7e9c8c8879110ed03fe7aa28a9.zip
net.http, httpclient_listener: Merge listener into net.http
-rw-r--r--net/http.lua52
-rw-r--r--net/httpclient_listener.lua66
2 files changed, 47 insertions, 71 deletions
diff --git a/net/http.lua b/net/http.lua
index 6287f408..59f2c080 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -13,9 +13,6 @@ 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,6 +22,52 @@ local log = require "util.logger".init("http");
module "http"
+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("%W", 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
@@ -152,8 +195,7 @@ function request(u, ex, callback)
req.reader = request_reader;
req.state = "status";
- listener.register_request(req.handler, req);
-
+ requests[req.handler] = req;
return req;
end
diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
deleted file mode 100644
index c4e3c153..00000000
--- a/net/httpclient_listener.lua
+++ /dev/null
@@ -1,66 +0,0 @@
--- Prosody IM
--- Copyright (C) 2008-2010 Matthew Wild
--- Copyright (C) 2008-2010 Waqas Hussain
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-local log = require "util.logger".init("httpclient_listener");
-local t_concat, t_insert = table.concat, table.insert;
-
-local connlisteners_register = require "net.connlisteners".register;
-
-local requests = {}; -- Open requests
-local buffers = {}; -- Buffers of partial lines
-
-local httpclient = { default_port = 80, default_mode = "*a" };
-
-function httpclient.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 httpclient.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 httpclient.ondisconnect(conn, err)
- local request = requests[conn];
- if request and request.conn then
- request:reader(nil);
- end
- requests[conn] = nil;
-end
-
-function httpclient.register_request(conn, req)
- log("debug", "Attaching request %s to connection %s", tostring(req.id or req), tostring(conn));
- requests[conn] = req;
-end
-
-connlisteners_register("httpclient", httpclient);