Software / code / prosody
Changeset
5191:9ab06d0dbf68
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 22 Nov 2012 20:42:12 +0100 |
| parents | 5189:7f6cc8ed2247 (current diff) 5190:76c73bd3d483 (diff) |
| children | 5194:9dca5bd5c2be |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_http.lua Thu Nov 22 19:38:42 2012 +0000 +++ b/plugins/mod_http.lua Thu Nov 22 20:42:12 2012 +0100 @@ -55,7 +55,7 @@ for port, services in pairs(ports) do local url = { scheme = (external_url.scheme or services[1].service.name); - host = (external_url.host or module.host); + host = (external_url.host or module:get_option_string("http_host", module.host)); port = tonumber(external_url.port) or port or 80; path = normalize_path(external_url.path or "/").. (get_base_path(module, app_name, default_path or "/"..app_name):sub(2));
