From cef5dd4ef619ead81d1a13574d0502d0c92259b1 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 14 Jul 2009 21:03:30 +0100 Subject: net.httpserver: Allow specification of the default base URL when using new_from_config() --- net/httpserver.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/httpserver.lua b/net/httpserver.lua index 77cc5b98..fefd289b 100644 --- a/net/httpserver.lua +++ b/net/httpserver.lua @@ -250,13 +250,13 @@ function new(params) 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 -- cgit v1.2.3 From f498cea75470f6b35070018f5b01f893cab36e0c Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 14 Jul 2009 21:04:07 +0100 Subject: mod_bosh: Update to use new new_from_config() --- plugins/mod_bosh.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index fdda206b..744893c4 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -276,6 +276,6 @@ function on_timer() 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); -- cgit v1.2.3 From 40f2dda03d4459ebd4e0928e3a671a4024c23b7a Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 14 Jul 2009 21:04:22 +0100 Subject: mod_httpserver: Update to use new new_from_config() too --- plugins/mod_httpserver.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua index 0f1d991c..a8639281 100644 --- a/plugins/mod_httpserver.lua +++ b/plugins/mod_httpserver.lua @@ -28,4 +28,4 @@ local function handle_request(method, body, request) 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); -- cgit v1.2.3