aboutsummaryrefslogtreecommitdiffstats
path: root/net/httpserver.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-14 21:04:57 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-14 21:04:57 +0100
commit086283ad1d3474993527d7689ac1fb5423aada9b (patch)
treeb284c4b4091fa23a34f7fecd8fb6582a44ea8451 /net/httpserver.lua
parentfed4a58f4e364a5901420285dcc13397467027a1 (diff)
parent40f2dda03d4459ebd4e0928e3a671a4024c23b7a (diff)
downloadprosody-086283ad1d3474993527d7689ac1fb5423aada9b.tar.gz
prosody-086283ad1d3474993527d7689ac1fb5423aada9b.zip
Merge with 0.5
Diffstat (limited to 'net/httpserver.lua')
-rw-r--r--net/httpserver.lua6
1 files 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