mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2018-10-14 14:19:21 +02:00
commit 29c9d1f508
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/mod_http.lua
View file

@ -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
@ -77,7 +81,7 @@ function moduleapi.http_url(module, app_name, default_path)
scheme = (external_url.scheme or service[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