Merge

[prosody.git] / plugins / mod_http_files.lua

diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index bd39936d288d6a0e4368b1528c28cd8158f6fff3..6ab295acf3070c9d2312e72a1a2f15519fb56370 100644 (file)
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -19,7 +19,7 @@ local base_path = module:get_option_string("http_files_dir", module:get_option_s
 local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" });
 local directory_index = module:get_option_boolean("http_dir_listing");
 
-local mime_map = module:shared("mime").types;
+local mime_map = module:shared("/*/http_files/mime").types;
 if not mime_map then
        mime_map = {
                html = "text/html", htm = "text/html",
@@ -32,7 +32,7 @@ if not mime_map then
                jpeg = "image/jpeg", jpg = "image/jpeg",
                svg = "image/svg+xml",
        };
-       module:shared("mime").types = mime_map;
+       module:shared("/*/http_files/mime").types = mime_map;
 
        local mime_types, err = open(module:get_option_string("mime_types_file", "/etc/mime.types"),"r");
        if mime_types then
@@ -51,6 +51,9 @@ end
 local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector have it if it wants to.
 
 function serve(opts)
+       if type(opts) ~= "table" then -- assume path string
+               opts = { path = opts };
+       end
        local base_path = opts.path;
        local dir_indices = opts.index_files or dir_indices;
        local directory_index = opts.directory_index;
@@ -78,11 +81,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 +104,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 +117,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 = full_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
 
@@ -126,6 +129,14 @@ function serve(opts)
        return serve_file;
 end
 
+function wrap_route(routes)
+       for route,handler in pairs(routes) do
+               if type(handler) ~= "function" then
+                       routes[route] = serve(handler);
+               end
+       end
+       return routes;
+end
 
 if base_path then
        module:provides("http", {