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 | f74e377a23600b3284f2cc9c4676c9836bae9d89 (patch) | |
| tree | bfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /plugins | |
| parent | b438e60d17b5103114ff9e187d171960d88259c9 (diff) | |
| parent | 9833b51da4e36251d94290577b504c9f8140d64d (diff) | |
| download | prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.tar.gz prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_http_files.lua | 3 |
1 files changed, 2 insertions, 1 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 |