Software / code / prosody
Changeset
1553:5e7b1d4ee655
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Jul 2009 21:04:57 +0100 |
| parents | 1549:0461fb35f2ac (current diff) 1552:334b66f614a6 (diff) |
| children | 1555:96d620b639d5 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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);
