From b33e46e4acf543c1c3b2f72ad3da28a2873e1b97 Mon Sep 17 00:00:00 2001 From: Anton Shestakov Date: Sat, 9 Jul 2016 21:55:37 +0800 Subject: mod_http_files: send valid ETag header RFC 2616 section 14 (header field definitions) shows that ETag header content should be wrapped in double quotes. --- plugins/mod_http_files.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 3b602495..40f46c9c 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -109,7 +109,7 @@ function serve(opts) local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification); response_headers.last_modified = last_modified; - local etag = ("%02x-%x-%x-%x"):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0); + local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0); response_headers.etag = etag; local if_none_match = request_headers.if_none_match -- cgit v1.2.3 From 1d46e953aad489bcf2e718b7d140ab79d1879204 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 11 Jul 2016 12:17:59 +0200 Subject: mod_http_files: Switch to use util.cache for cache --- plugins/mod_http_files.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index 40f46c9c..a710679b 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -17,6 +17,7 @@ local build_path = require"socket.url".build_path; 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 dir_indices = module:get_option("http_index_files", { "index.html", "index.htm" }); local directory_index = module:get_option_boolean("http_dir_listing"); @@ -81,7 +82,7 @@ function sanitize_path(path) return "/"..table.concat(out, "/"); end -local cache = setmetatable({}, { __mode = "kv" }); -- Let the garbage collector have it if it wants to. +local cache = require "util.cache".new(cache_size); function serve(opts) if type(opts) ~= "table" then -- assume path string @@ -119,7 +120,7 @@ function serve(opts) return 304; end - local data = cache[orig_path]; + local data = cache:get(orig_path); if data and data.etag == etag then response_headers.content_type = data.content_type; data = data.data; @@ -157,7 +158,7 @@ function serve(opts) end local ext = full_path:match("%.([^./]+)$"); local content_type = ext and mime_map[ext]; - cache[orig_path] = { data = data; content_type = content_type; etag = etag }; + cache:set(orig_path, { data = data; content_type = content_type; etag = etag }); response_headers.content_type = content_type; end -- cgit v1.2.3 From 2d847c082f71f7a0e80d9c18f9ca5fec1096541a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 11 Jul 2016 12:20:25 +0200 Subject: mod_http_files: Send larger files using new file handle API --- plugins/mod_http_files.lua | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'plugins') 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); -- cgit v1.2.3 From 135071b7364ef0a93be023c38060e07a73923ad9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 12 Jul 2016 10:39:04 +0200 Subject: mod_http_errors: Add a newline after end of HTML --- plugins/mod_http_errors.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_http_errors.lua b/plugins/mod_http_errors.lua index 0c37e104..17d357e5 100644 --- a/plugins/mod_http_errors.lua +++ b/plugins/mod_http_errors.lua @@ -43,7 +43,8 @@ local html = [[

$message

$extra

-]]; + +]]; html = html:gsub("%s%s+", ""); local entities = { -- cgit v1.2.3