diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-27 00:36:34 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-27 00:36:34 +0200 |
| commit | 23fa3312e7d966a9205274189eb6b5d0d793c3be (patch) | |
| tree | a060ff32f39e4a6fbce69a8c25da3d7f1e45900d | |
| parent | 9a4c2f7e52b68d56c4c883234cc704ef1b045b33 (diff) | |
| parent | 60ca835146d1b3857be9a82579907afe5449556e (diff) | |
| download | prosody-23fa3312e7d966a9205274189eb6b5d0d793c3be.tar.gz prosody-23fa3312e7d966a9205274189eb6b5d0d793c3be.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/mod_http_files.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 2e9f4182..7c503c82 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -61,8 +61,8 @@ function serve(opts) 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 |