diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
| commit | 0e4e770687183e78e70ea16d056c039062b3708f (patch) | |
| tree | 2e6a296aac1eb2dbf8f40a56235d32870b270b99 /plugins/mod_http_files.lua | |
| parent | e8cb3e473a07e28039c0b41ab1ee83db524364f5 (diff) | |
| parent | b9c17069eac26443575ceee3674a12cb41df4f52 (diff) | |
| download | prosody-0e4e770687183e78e70ea16d056c039062b3708f.tar.gz prosody-0e4e770687183e78e70ea16d056c039062b3708f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_http_files.lua')
| -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 |