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

mod_http: Move normalize_path to util.http

Browse source
This commit is contained in:
Kim Alvefur 2018-10-14 14:31:59 +02:00
parent 29c9d1f508
commit 0247a0e904
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/mod_http.lua
View file

@ -13,6 +13,7 @@ local portmanager = require "core.portmanager";
local moduleapi = require "core.moduleapi";
local url_parse = require "socket.url".parse;
local url_build = require "socket.url".build;
local normalize_path = require "util.http".normalize_path;
local server = require "net.http.server";
@ -21,16 +22,6 @@ 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, 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
local function get_http_event(host, app_path, key)
local method, path = key:match("^(%S+)%s+(.+)$");
if not method then -- No path specified, default to "" (base path)

11
util/http.lua
View file

@ -57,8 +57,19 @@ local function contains_token(field, token)
return field:find(","..token:lower()..",", 1, true) ~= nil;
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
return {
urlencode = urlencode, urldecode = urldecode;
formencode = formencode, formdecode = formdecode;
contains_token = contains_token;
normalize_path = normalize_path;
};