aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-11 12:20:25 +0200
committerKim Alvefur <zash@zash.se>2016-07-11 12:20:25 +0200
commit2d847c082f71f7a0e80d9c18f9ca5fec1096541a (patch)
treeb68bc8521769c3c0f622451c9317f6abd67f2b13 /plugins
parent1d46e953aad489bcf2e718b7d140ab79d1879204 (diff)
downloadprosody-2d847c082f71f7a0e80d9c18f9ca5fec1096541a.tar.gz
prosody-2d847c082f71f7a0e80d9c18f9ca5fec1096541a.zip
mod_http_files: Send larger files using new file handle API
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_http_files.lua19
1 files changed, 12 insertions, 7 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index a710679b..ab2f3966 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -18,6 +18,7 @@ local path_sep = package.config:sub(1,1);
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 @@ function serve(opts)
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];
- cache:set(orig_path, { data = data; content_type = content_type; etag = etag });
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 });
end
return response:send(data);