aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_http.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-14 14:01:57 +0200
committerKim Alvefur <zash@zash.se>2018-10-14 14:01:57 +0200
commite0d1114157e4a32081e293c52f6968e6b21ff7b5 (patch)
tree42a0edf59a528bcdcd0a6822d1b8f49f4ac76c05 /plugins/mod_http.lua
parent6f21218763fb721fb523cd592ae8abf456db6112 (diff)
downloadprosody-e0d1114157e4a32081e293c52f6968e6b21ff7b5.tar.gz
prosody-e0d1114157e4a32081e293c52f6968e6b21ff7b5.zip
mod_http: Make sure path from http_external_url always ends with a slash (fixes #1183)
Diffstat (limited to 'plugins/mod_http.lua')
-rw-r--r--plugins/mod_http.lua10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index a15e8cda..e678e663 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -21,8 +21,12 @@ server.set_default_host(module:get_option_string("http_default_host"));
server.set_option("body_size_limit", module:get_option_number("http_max_content_size"));
server.set_option("buffer_size_limit", module:get_option_number("http_max_buffer_size"));
-local function normalize_path(path)
- if path:sub(-1,-1) == "/" then path = path:sub(1, -2); end
+local function normalize_path(path, is_dir)
+ if is_dir then
+ if path:sub(-1,-1) ~= "/" then path = path.."/"; end
+ else
+ if path:sub(-1,-1) == "/" then path = path:sub(1, -2); end
+ end
if path:sub(1,1) ~= "/" then path = "/"..path; end
return path;
end
@@ -70,7 +74,7 @@ function moduleapi.http_url(module, app_name, default_path)
scheme = (external_url.scheme or services[1].service.name);
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 "/")..
+ path = normalize_path(external_url.path or "/", true)..
(get_base_path(module, app_name, default_path or "/"..app_name):sub(2));
}
if ports_by_scheme[url.scheme] == url.port then url.port = nil end