Software / code / prosody
Diff
plugins/mod_http_files.lua @ 6887:da38775bda82
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Sep 2015 00:36:34 +0200 |
| parent | 6031:8796aa94c4b5 |
| parent | 6873:6dae43341b44 |
| child | 7061:eda0feeaf759 |
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
