X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttp.lua;h=9d2f9b968f2ec3e7173176bb80af5b996cef620c;hb=68aa12bf2c6ed9f24e90e918bff5e43ac5e3007f;hp=38db0c0df2f6ebce0130301fc017465182fba7d2;hpb=616b4f7f6b8537693e450974ad2d95a0a10d026f;p=prosody.git

diff --git a/net/http.lua b/net/http.lua
index 38db0c0d..9d2f9b96 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local socket = require "socket"
 local mime = require "mime"
@@ -9,14 +17,17 @@ 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 tonumber, tostring, pairs = tonumber, tostring, pairs;
-local print = function () end
+local tonumber, tostring, pairs, xpcall, select, debug_traceback, char, format = 
+        tonumber, tostring, pairs, xpcall, select, debug.traceback, string.char, string.format;
 
-local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
-local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
+local log = require "util.logger".init("http");
+local print = function () end
 
 module "http"
 
+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
+
 local function expectbody(reqt, code)
     if reqt.method == "HEAD" then return nil end
     if code == 204 or code == 304 then return nil end
@@ -27,15 +38,18 @@ end
 local function request_reader(request, data, startpos)
 	if not data then
 		if request.body then
+			log("debug", "Connection closed, but we have data, calling callback...");
 			request.callback(t_concat(request.body), request.code, request);
-		else
+		elseif request.state ~= "completed" then
 			-- Error.. connection was closed prematurely
 			request.callback("connection-closed", 0, request);
 		end
 		destroy_request(request);
+		request.body = nil;
+		request.state = "completed";
 		return;
 	end
-	if request.state == "body" then
+	if request.state == "body" and request.state ~= "completed" then
 		print("Reading body...")
 		if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.responseheaders["content-length"]); end
 		if startpos then
@@ -46,11 +60,15 @@ local function request_reader(request, data, startpos)
 			request.havebodylength = request.havebodylength + #data;
 			if request.havebodylength >= request.bodylength then
 				-- We have the body
+				log("debug", "Have full body, calling callback");
 				if request.callback then
 					request.callback(t_concat(request.body), request.code, request);
 				end
+				request.body = nil;
+				request.state = "completed";
+			else
+				print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
 			end
-			print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
 		end
 	elseif request.state == "headers" then
 		print("Reading headers...")
@@ -100,9 +118,19 @@ local function request_reader(request, data, startpos)
 	end
 end
 
+local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
 function request(u, ex, callback)
 	local req = url.parse(u);
 	
+	if not (req and req.host) then
+		callback(nil, 0, req);
+		return nil, "invalid-url";
+	end
+	
+	if not req.path then
+		req.path = "/";
+	end
+	
 	local custom_headers, body;
 	local default_headers = { ["Host"] = req.host, ["User-Agent"] = "Prosody XMPP Server" }
 	
@@ -112,7 +140,7 @@ function request(u, ex, callback)
 	end
 	
 	if ex then
-		custom_headers = ex.custom_headers;
+		custom_headers = ex.headers;
 		req.onlystatus = ex.onlystatus;
 		body = ex.body;
 		if body then
@@ -123,15 +151,23 @@ function request(u, ex, callback)
 		if ex.method then req.method = ex.method; end
 	end
 	
-	req.handler, req.conn = server.wraptcpclient(listener, socket.tcp(), req.host, req.port or 80, 0, "*a");
+	req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
 	req.write = req.handler.write;
 	req.conn:settimeout(0);
 	local ok, err = req.conn:connect(req.host, req.port or 80);
 	if not ok and err ~= "timeout" then
+		callback(nil, 0, req);
 		return nil, err;
 	end
 	
-	req.write((req.method or "GET ")..req.path.." HTTP/1.0\r\n");
+	local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
+	
+	if req.query then
+		t_insert(request_line, 4, "?");
+		t_insert(request_line, 5, req.query);
+	end
+	
+	req.write(t_concat(request_line));
 	local t = { [2] = ": ", [4] = "\r\n" };
 	if custom_headers then
 		for k, v in pairs(custom_headers) do
@@ -152,9 +188,9 @@ function request(u, ex, callback)
 		req.write(body);
 	end
 	
-	req.callback = callback;
+	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.reader = request_reader;
-	req.state = "status"
+	req.state = "status";
 	
 	listener.register_request(req.handler, req);