diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
| commit | 7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (patch) | |
| tree | bfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 | |
| parent | 8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (diff) | |
| parent | 9ea9c5719a2275b3ae66378619cef64a392a1fec (diff) | |
| download | prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.tar.gz prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_http_files.lua | 3 | ||||
| -rw-r--r-- | util/pluginloader.lua | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index dd04853b..2e9f4182 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 diff --git a/util/pluginloader.lua b/util/pluginloader.lua index b894f527..b9b3e207 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); |