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

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2014-03-09 23:47:53 +01:00
commit 9ea9c5719a
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/mod_http_files.lua
View file

@ -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

8
util/pluginloader.lua
View file

@ -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);