diff options
| author | Kim Alvefur <zash@zash.se> | 2012-11-22 20:42:12 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2012-11-22 20:42:12 +0100 |
| commit | d48e08b81a83f03c6100b6aab300011bb0949701 (patch) | |
| tree | cf80e927bc69438c73a067e6ccfa839a4e885a94 | |
| parent | 814a4d86112a7350353e14964ee5d25dd190884e (diff) | |
| parent | 12f09bf02b02dfca971728efe52f95d93a7d7087 (diff) | |
| download | prosody-d48e08b81a83f03c6100b6aab300011bb0949701.tar.gz prosody-d48e08b81a83f03c6100b6aab300011bb0949701.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/mod_http.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 4f09716c..f386f870 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -55,7 +55,7 @@ function moduleapi.http_url(module, app_name, default_path) 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)); |