aboutsummaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-04-26 20:49:31 +0200
committerKim Alvefur <zash@zash.se>2020-04-26 20:49:31 +0200
commit9bc378f662b3fa884bdbac472152fae483742c64 (patch)
tree501388924cc264d72216d97b404e2438b128b222 /net/http
parentce1056565dde6666a85a70733bdc5998bf4c9896 (diff)
parent156f32c8230e9dd86924893793cd6befc78665de (diff)
downloadprosody-9bc378f662b3fa884bdbac472152fae483742c64.tar.gz
prosody-9bc378f662b3fa884bdbac472152fae483742c64.zip
Merge 0.11->trunk
Diffstat (limited to 'net/http')
-rw-r--r--net/http/files.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/files.lua b/net/http/files.lua
index 650c6f47..583f7514 100644
--- a/net/http/files.lua
+++ b/net/http/files.lua
@@ -80,7 +80,7 @@ local 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 = ('"%x-%x-%x"'):format(attr.change or 0, attr.size or 0, attr.modification or 0);
response_headers.etag = etag;
local if_none_match = request_headers.if_none_match