Software / code / prosody
Changeset
6887:da38775bda82
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Sep 2015 00:36:34 +0200 |
| parents | 6886:27f5a76e3fa5 (current diff) 6873:6dae43341b44 (diff) |
| children | 6888:39c5c49616ab 6889:7f7920f2aebf |
| files | plugins/mod_http_files.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_http_files.lua Sun Sep 27 00:28:46 2015 +0200 +++ b/plugins/mod_http_files.lua Sun Sep 27 00:36:34 2015 +0200 @@ -61,8 +61,8 @@ local function serve_file(event, path) 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:gsub('%'..path_sep..'+$',''))); + local full_path = base_path .. (path and "/"..path or ""):gsub("/", path_sep); + local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows if not attr then return 404; end
