# HG changeset patch # User Kim Alvefur # Date 1468232425 -7200 # Node ID 491975f5d3835f72ab42dbb1dc8580a57222ffd5 # Parent b75b08af7a78723bd631a896d06658845c72fc5f mod_http_files: Send larger files using new file handle API diff -r b75b08af7a78 -r 491975f5d383 plugins/mod_http_files.lua --- a/plugins/mod_http_files.lua Mon Jul 11 12:17:59 2016 +0200 +++ b/plugins/mod_http_files.lua Mon Jul 11 12:20:25 2016 +0200 @@ -18,6 +18,7 @@ local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path")); local cache_size = module:get_option_number("http_files_cache_size", 128); +local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096); local dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); local directory_index = module:get_option_boolean("http_dir_listing"); @@ -148,18 +149,22 @@ else local f, err = open(full_path, "rb"); - if f then - data, err = f:read("*a"); - f:close(); - end - if not data then - module:log("debug", "Could not open or read %s. Error was %s", full_path, err); + if not f then + module:log("debug", "Could not open %s. Error was %s", full_path, err); return 403; end local ext = full_path:match("%.([^./]+)$"); local content_type = ext and mime_map[ext]; + response_headers.content_type = content_type; + if attr.size > cache_max_file_size then + response_headers.content_length = attr.size; + module:log("debug", "%d > cache_max_file_size", attr.size); + return response:send_file(f); + else + data = f:read("*a"); + f:close(); + end cache:set(orig_path, { data = data; content_type = content_type; etag = etag }); - response_headers.content_type = content_type; end return response:send(data);