projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_s2s, mod_dialback: Rename s2s-authenticate-legacy event to s2sout-authenticate...
[prosody.git]
/
plugins
/
mod_http.lua
diff --git
a/plugins/mod_http.lua
b/plugins/mod_http.lua
index e73778ae630f9c4091dcec1410efbed34ac0d45d..c53815779afd4037a663bfecc0e6fa0be97483f1 100644
(file)
--- 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)
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 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, };
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 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);
local _handler = handler;
handler = function (event)
local path = event.request.path:sub(base_path_len);