aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-16 08:34:50 +0100
committerKim Alvefur <zash@zash.se>2012-12-16 08:34:50 +0100
commiteaba58e39b083025ae4236d3ef516b59c081d326 (patch)
treec604c2a76b0d571da3c39a2b8505ca1a538f4f3a /plugins
parent7c7e98953e06e6d622e7fe93970d91d99716bfe0 (diff)
downloadprosody-eaba58e39b083025ae4236d3ef516b59c081d326.tar.gz
prosody-eaba58e39b083025ae4236d3ef516b59c081d326.zip
mod_http_files: Compare If-Modified-Since to last modification date
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_http_files.lua11
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 92617b09..d83e6f97 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -57,11 +57,14 @@ function serve_file(event, path)
return 404;
end
- response.headers.last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
+ local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
+ response.headers.last_modified = last_modified;
- local tag = ("%02x-%x-%x-%x"):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
- response.headers.etag = tag;
- if tag == request.headers.if_none_match then
+ 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;
+
+ if etag == request.headers.if_none_match
+ or last_modified == request.headers.if_modified_since then
return 304;
end