From ebf052523ae1d616aebbc88996c9e7e5f9e7fee3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 9 Mar 2014 22:15:40 +0100 Subject: util.pluginloader: Always use path separator from package.config (thanks Junne) --- util/pluginloader.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/pluginloader.lua b/util/pluginloader.lua index c10fdf65..112c0d52 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -39,10 +39,10 @@ function load_resource(plugin, resource) resource = resource or "mod_"..plugin..".lua"; local names = { - "mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua - "mod_"..plugin.."/"..resource; -- mod_hello/mod_hello.lua - plugin.."/"..resource; -- hello/mod_hello.lua - resource; -- mod_hello.lua + "mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua + "mod_"..plugin..dir_sep..resource; -- mod_hello/mod_hello.lua + plugin..dir_sep..resource; -- hello/mod_hello.lua + resource; -- mod_hello.lua }; return load_file(names); -- cgit v1.2.3 From f666a0d9340519bc839fa97f2f9d5e6e8cad9cdb Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 9 Mar 2014 22:16:44 +0100 Subject: mod_http_files: Strip path separator from end of paths, was broken on Windows (thanks Junne) --- plugins/mod_http_files.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 6ab295ac..3a9368b9 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -14,6 +14,7 @@ local os_date = os.date; local open = io.open; local stat = lfs.attributes; local build_path = require"socket.url".build_path; +local path_sep = package.config:sub(1,1); local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path")); local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); @@ -61,7 +62,7 @@ function serve(opts) local request, response = event.request, event.response; local orig_path = request.path; local full_path = base_path .. (path and "/"..path or ""); - local attr = stat(full_path); + local attr = stat((full_path:gsub('%'..path_sep..'+$',''))); if not attr then return 404; end -- cgit v1.2.3