diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-11-22 21:01:00 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-11-22 21:01:00 +0000 |
| commit | 032bbb82d3da940ae9df3f370a5e98c5b56b3d55 (patch) | |
| tree | f70daf210feb67558ef27e20195d002fa3aef5d1 /plugins/mod_http.lua | |
| parent | 2cb192af38cad5e903bdd9a1f356a0ea01513de5 (diff) | |
| parent | 565ea2bbe10267a1310c2efed6aaffecd59c6def (diff) | |
| download | prosody-032bbb82d3da940ae9df3f370a5e98c5b56b3d55.tar.gz prosody-032bbb82d3da940ae9df3f370a5e98c5b56b3d55.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_http.lua')
| -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)); |