# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247601897 -3600
# Node ID 5e7b1d4ee655a1cb15c06db6772acbadebbe684f
# Parent  0461fb35f2ac9c154d1903bd3be6efe49204c498# Parent  334b66f614a68fb83be9a5fb38397422c8efdae2
Merge with 0.5

diff -r 0461fb35f2ac -r 5e7b1d4ee655 net/httpserver.lua
--- a/net/httpserver.lua	Tue Jul 14 17:09:43 2009 +0100
+++ b/net/httpserver.lua	Tue Jul 14 21:04:57 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
diff -r 0461fb35f2ac -r 5e7b1d4ee655 plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Tue Jul 14 17:09:43 2009 +0100
+++ b/plugins/mod_bosh.lua	Tue Jul 14 21:04:57 2009 +0100
@@ -276,6 +276,6 @@
 end
 
 local ports = config.get(module.host, "core", "bosh_ports") or { 5280 };
-httpserver.new_from_config(ports, handle_request);
+httpserver.new_from_config(ports, "http-bind", handle_request);
 
 server.addtimer(on_timer);
diff -r 0461fb35f2ac -r 5e7b1d4ee655 plugins/mod_httpserver.lua
--- a/plugins/mod_httpserver.lua	Tue Jul 14 17:09:43 2009 +0100
+++ b/plugins/mod_httpserver.lua	Tue Jul 14 21:04:57 2009 +0100
@@ -28,4 +28,4 @@
 end
 
 local ports = config.get(module.host, "core", "http_ports") or { 5280 };
-httpserver.new_from_config(ports, handle_request);
+httpserver.new_from_config(ports, "files", handle_request);