aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-14 14:31:59 +0200
committerKim Alvefur <zash@zash.se>2018-10-14 14:31:59 +0200
commit0abe1f81419a1df23df88ef7063b3cb0713bbfdc (patch)
tree34780f34fa2362994aec9153e0ed7db7c1feda7b /plugins
parenta1671d889e30f43aa7f6379b2792600709fd4d7e (diff)
downloadprosody-0abe1f81419a1df23df88ef7063b3cb0713bbfdc.tar.gz
prosody-0abe1f81419a1df23df88ef7063b3cb0713bbfdc.zip
mod_http: Move normalize_path to util.http
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_http.lua11
1 files changed, 1 insertions, 10 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 19f1e2fa..a1d409bd 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -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)