X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_http.lua;h=c53815779afd4037a663bfecc0e6fa0be97483f1;hb=6af1efb88bc7ffe884cc0e28d5aa30b05feea70e;hp=4f09716c29e685a3bfa5d4bc3f8f64d587b95f94;hpb=ae8c203f4f76242fb0d720edf02a1235e3aaf93a;p=prosody.git

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 4f09716c..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, };
@@ -55,7 +56,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));
@@ -88,10 +89,10 @@ function module.add_host(module)
 					local data = handler;
 					handler = function () return data; end
 				elseif event_name:sub(-2, -1) == "/*" then
-					local base_path = event_name:match("/(.+)/*$");
+					local base_path_len = #event_name:match("/.+$");
 					local _handler = handler;
 					handler = function (event)
-						local path = event.request.path:sub(#base_path+1);
+						local path = event.request.path:sub(base_path_len);
 						return _handler(event, path);
 					end;
 				end