X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttpserver.lua;h=fefd289bc322daaa25f6d5bd94a1925753ac8b47;hb=d7563fd6f04b7a307ee1aa4fdc557e104b8a4dad;hp=8ce25f356c23799a99a171e402f0e4dfc658eb3c;hpb=02487b98e0d4e7cd3a6faa8c666044cb5badc729;p=prosody.git

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 8ce25f35..fefd289b 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,7 +17,7 @@ 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 urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
 
@@ -242,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;