mod_http_files: Work with non-wildcard-routes. Key cache on the original HTTP path.

[prosody.git] / plugins / mod_http_files.lua

diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index bd39936d288d6a0e4368b1528c28cd8158f6fff3..311b3a4b950e504ebf9a3e2804f4cfb4792ae478 100644 (file)
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -78,11 +78,11 @@ function serve(opts)
                        return 304;
                end
 
-               local data = cache[path];
+               local data = cache[orig_path];
                if data and data.etag == etag then
                        response_headers.content_type = data.content_type;
                        data = data.data;
-               elseif attr.mode == "directory" then
+               elseif attr.mode == "directory" and path then
                        if full_path:sub(-1) ~= "/" then
                                local path = { is_absolute = true, is_directory = true };
                                for dir in orig_path:gmatch("[^/]+") do path[#path+1]=dir; end
@@ -101,7 +101,7 @@ function serve(opts)
                        if not data then
                                return 403;
                        end
-                       cache[path] = { data = data, content_type = mime_map.html; etag = etag; };
+                       cache[orig_path] = { data = data, content_type = mime_map.html; etag = etag; };
                        response_headers.content_type = mime_map.html;
 
                else
@@ -114,9 +114,9 @@ function serve(opts)
                                module:log("debug", "Could not open or read %s. Error was %s", full_path, err);
                                return 403;
                        end
-                       local ext = path:match("%.([^./]+)$");
+                       local ext = orig_path:match("%.([^./]+)$");
                        local content_type = ext and mime_map[ext];
-                       cache[path] = { data = data; content_type = content_type; etag = etag };
+                       cache[orig_path] = { data = data; content_type = content_type; etag = etag };
                        response_headers.content_type = content_type;
                end