X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttpserver.lua;h=699e0324dfcb35565fd5a3e46bd3ad6c61421292;hb=4e16323f2a78a2f20bcd75957f2ada27a5d8b90f;hp=3a3c34b4084af8d1a3b1cba97045a31ac178a162;hpb=67081a9864d45796f59658ccd4b779ffbe0d44e0;p=prosody.git

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 3a3c34b4..699e0324 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.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 server = require "net.server"
@@ -9,10 +17,9 @@ local listener;
 
 local t_insert, t_concat = table.insert, table.concat;
 local s_match, s_gmatch = string.match, string.gmatch;
-local tonumber, tostring, pairs = tonumber, tostring, pairs;
+local tonumber, tostring, pairs, ipairs, type = tonumber, tostring, pairs, ipairs, type;
 
-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("%%%x", c:byte()); end)); 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("httpserver");
 
@@ -30,7 +37,7 @@ local function send_response(request, response)
 	-- Write status line
 	local resp;
 	if response.body then
-		log("debug", "Sending response to %s: %s", request.id, response.body);
+		log("debug", "Sending response to %s", request.id);
 		resp = { "HTTP/1.0 ", response.status or "200 OK", "\r\n"};
 		local h = response.headers;
 		if h then
@@ -53,7 +60,7 @@ local function send_response(request, response)
 		end
 	else
 		-- Response we have is just a string (the body)
-		log("debug", "Sending response to %s: %s", request.id, response);
+		log("debug", "Sending response to %s: %s", request.id or "<none>", response or "<none>");
 		
 		resp = { "HTTP/1.0 200 OK\r\n" };
 		t_insert(resp, "Connection: close\r\n");
@@ -96,10 +103,10 @@ local function call_callback(request, err)
 		
 		local response = callback(request.method, request.body and t_concat(request.body), request);
 		if response then
-			if response == true then
+			if response == true and not request.destroyed then
 				-- Keep connection open, we will reply later
-				log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
-			else
+				log("debug", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+			elseif response ~= true then
 				-- Assume response
 				send_response(request, response);
 				destroy_request(request);
@@ -126,7 +133,7 @@ local function request_reader(request, data, startpos)
 	end
 	if request.state == "body" then
 		log("debug", "Reading body...")
-		if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.responseheaders["content-length"]); end
+		if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.headers["content-length"]); end
 		if startpos then
 			data = data:sub(startpos, -1)
 		end
@@ -141,7 +148,7 @@ local function request_reader(request, data, startpos)
 	elseif request.state == "headers" then
 		log("debug", "Reading headers...")
 		local pos = startpos;
-		local headers = request.responseheaders or {};
+		local headers = request.headers or {};
 		for line in data:gmatch("(.-)\r\n") do
 			startpos = (startpos or 1) + #line + 2;
 			local k, v = line:match("(%S+): (.+)");
@@ -149,7 +156,7 @@ local function request_reader(request, data, startpos)
 				headers[k:lower()] = v;
 --				log("debug", "Header: "..k:lower().." = "..v);
 			elseif #line == 0 then
-				request.responseheaders = headers;
+				request.headers = headers;
 				break;
 			else
 				log("debug", "Unhandled header line: "..line);
@@ -243,6 +250,26 @@ function new(params)
 	end
 end
 
+function new_from_config(ports, default_base, handle_request)
+	for _, options in ipairs(ports) do
+		local port, base, ssl, interface = 5280, default_base, false, nil;
+		if type(options) == "number" then
+			port = options;
+		elseif type(options) == "table" then
+			port, base, ssl, interface = options.port or 5280, options.path or default_base, options.ssl or false, options.interface;
+		elseif type(options) == "string" then
+			base = options;
+		end
+		
+		if ssl then
+			ssl.mode = "server";
+			ssl.protocol = "sslv23";
+		end
+		
+		new{ port = port, base = base, handler = handle_request, ssl = ssl, type = (ssl and "ssl") or "tcp" }
+	end
+end
+
 _M.request_reader = request_reader;
 _M.send_response = send_response;
 _M.urlencode = urlencode;