diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-11-15 14:07:53 -0500 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-11-15 14:07:53 -0500 |
commit | 1862c03a88a5fee03460dae23eb958eaa4d31580 (patch) | |
tree | b4f61532023b0ef12dadab99cc45df9e12a7502e /plugins/mod_http.lua | |
parent | 20b97c9c9372fd03f9665669399065869eec0bce (diff) | |
parent | baa85ada77e54389fc446cbc2343f70b11613b7c (diff) | |
download | prosody-1862c03a88a5fee03460dae23eb958eaa4d31580.tar.gz prosody-1862c03a88a5fee03460dae23eb958eaa4d31580.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 22441faa..a7b4a45f 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -67,7 +67,7 @@ function moduleapi.http_url(module, app_name, default_path) end function module.add_host(module) - local host = module.host; + local host = module:get_option_string("http_host", module.host); local apps = {}; module.environment.apps = apps; local function http_app_added(event) |