Software / code / prosody
Changeset
6032:c0ee152400ff
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Mar 2014 23:48:32 +0100 |
| parents | 6028:14c63b8c3e06 (current diff) 6031:8796aa94c4b5 (diff) |
| children | 6039:f8df0a996575 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_http_files.lua Wed Feb 26 22:22:43 2014 +0100 +++ b/plugins/mod_http_files.lua Sun Mar 09 23:48:32 2014 +0100 @@ -14,6 +14,7 @@ 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 @@ 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
--- a/util/pluginloader.lua Wed Feb 26 22:22:43 2014 +0100 +++ b/util/pluginloader.lua Sun Mar 09 23:48:32 2014 +0100 @@ -39,10 +39,10 @@ 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);
