diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-10 11:29:47 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-10 11:29:47 +0000 |
| commit | 05cd95bf80167c87312b04107a3f2abc25e83094 (patch) | |
| tree | 479c845b81a7d47465c3223177a7119dbe3dd7ba /plugins/mod_http.lua | |
| parent | 4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (diff) | |
| parent | e39fde236178e9d41cf0b1f56aae0aad382df96b (diff) | |
| download | prosody-05cd95bf80167c87312b04107a3f2abc25e83094.tar.gz prosody-05cd95bf80167c87312b04107a3f2abc25e83094.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_http.lua')
| -rw-r--r-- | plugins/mod_http.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 018f2ea3..c5381577 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -38,9 +38,10 @@ local function get_http_event(host, app_path, key) end local function get_base_path(host_module, app_name, default_app_path) - return normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host + return (normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host or module:get_option("http_paths", {})[app_name] -- Global - or default_app_path); -- Default + or default_app_path)) -- Default + :gsub("%$(%w+)", { host = module.host }); end local ports_by_scheme = { http = 80, https = 443, }; |