aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-03 00:54:58 +0100
committerMatthew Wild <mwild1@gmail.com>2009-10-03 00:54:58 +0100
commit6265a85de2055048bf60ae8e598d1667ebf660c7 (patch)
tree38852ed460702df6d68497316e44b286dd8e605c /net
parentf868e12c5f970abe9f71aac5ac50c36618748368 (diff)
downloadprosody-6265a85de2055048bf60ae8e598d1667ebf660c7.tar.gz
prosody-6265a85de2055048bf60ae8e598d1667ebf660c7.zip
net.httpserver: Allow modules registering to provide more than just a default path when using httpserver.new_from_config
Diffstat (limited to 'net')
-rw-r--r--net/httpserver.lua16
1 files changed, 13 insertions, 3 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 56dfe04e..3a54fd62 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -252,13 +252,23 @@ function set_default_handler(handler)
default_handler = handler;
end
-function new_from_config(ports, default_base, handle_request)
+function new_from_config(ports, handle_request, default_options)
+ if type(handle_request) == "string" then -- COMPAT with old plugins
+ log("warn", "Old syntax of httpserver.new_from_config being used to register %s", handle_request);
+ handle_request, default_options = default_options, { base = handle_request };
+ end
for _, options in ipairs(ports) do
- local port, base, ssl, interface = 5280, default_base, false, nil;
+ local port = default_options.port or 5280;
+ local base = default_options.base;
+ local ssl = default_options.ssl or false;
+ local interface = default_options.interface;
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;
+ port = options.port or port;
+ base = options.path or base;
+ ssl = options.ssl or ssl;
+ interface = options.interface or interface;
elseif type(options) == "string" then
base = options;
end