X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmod_http.lua;h=c53815779afd4037a663bfecc0e6fa0be97483f1;hb=6af1efb88bc7ffe884cc0e28d5aa30b05feea70e;hp=e73778ae630f9c4091dcec1410efbed34ac0d45d;hpb=278e754c4156d122a79cb6d382e07382da1dbda5;p=prosody.git diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index e73778ae..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, }; @@ -88,7 +89,7 @@ function module.add_host(module) local data = handler; handler = function () return data; end elseif event_name:sub(-2, -1) == "/*" then - local base_path_len = #event_name:match("(/.+/)%*$")+1; + local base_path_len = #event_name:match("/.+$"); local _handler = handler; handler = function (event) local path = event.request.path:sub(base_path_len);