aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-21 08:27:14 +0100
committerKim Alvefur <zash@zash.se>2012-12-21 08:27:14 +0100
commitd1880e05fd34668daa71ed14b70a9a13189d7e9f (patch)
tree916236cbd231c75b0627d5ca86a2b409ef570f99
parentf098458b690ecc4b71ec604f81acf8191f0990f8 (diff)
downloadprosody-d1880e05fd34668daa71ed14b70a9a13189d7e9f.tar.gz
prosody-d1880e05fd34668daa71ed14b70a9a13189d7e9f.zip
mod_http_files: Only match on modification date when if-none-match is not present
-rw-r--r--plugins/mod_http_files.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index dea209c8..c0d9b2ec 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -68,7 +68,7 @@ function serve_file(event, path)
local if_none_match = request_headers.if_none_match
local if_modified_since = request_headers.if_modified_since;
if etag == if_none_match
- or last_modified == if_modified_since then
+ or (not if_none_match and last_modified == if_modified_since) then
return 304;
end