# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247601810 -3600
# Node ID 03f89de65d9f6111fd26366bb0cc84fe37f69e55
# Parent  b88b30c9e688632b1bb7e5e5ea1d7ba1562a1cc9
net.httpserver: Allow specification of the default base URL when using new_from_config()

diff -r b88b30c9e688 -r 03f89de65d9f net/httpserver.lua
--- a/net/httpserver.lua	Tue Jul 14 17:09:18 2009 +0100
+++ b/net/httpserver.lua	Tue Jul 14 21:03:30 2009 +0100
@@ -250,13 +250,13 @@
 	end
 end
 
-function new_from_config(ports, handle_request)
+function new_from_config(ports, default_base, handle_request)
 	for _, options in ipairs(ports) do
-		local port, base, ssl, interface = 5280, "http-bind", false, nil;
+		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 "http-bind", options.ssl or false, options.interface;
+			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