From f161093e1fa704f8241738afaccc0bc84cf9e37e Mon Sep 17 00:00:00 2001 From: armadi1809 Date: Thu, 13 Jun 2024 13:08:09 -0500 Subject: [PATCH 1/2] Removed newline characters from precomputed etags --- modules/caddyhttp/fileserver/staticfiles.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go index 5d54742ddb7..e91d06f1ab7 100644 --- a/modules/caddyhttp/fileserver/staticfiles.go +++ b/modules/caddyhttp/fileserver/staticfiles.go @@ -15,6 +15,7 @@ package fileserver import ( + "bytes" "errors" "fmt" "io" @@ -690,6 +691,10 @@ func (fsrv *FileServer) getEtagFromFile(fileSystem fs.FS, filename string) (stri if err != nil { return "", fmt.Errorf("cannot read etag from file %s: %v", etagFilename, err) } + + // Etags should not contain newline characters + etag = bytes.ReplaceAll(etag, []byte("\n"), []byte("")) + return string(etag), nil } return "", nil From 04f1b270dfe8cec34247089f031eee1ec353c214 Mon Sep 17 00:00:00 2001 From: Matt Holt Date: Sat, 15 Jun 2024 07:51:49 -0600 Subject: [PATCH 2/2] Update modules/caddyhttp/fileserver/staticfiles.go --- modules/caddyhttp/fileserver/staticfiles.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/caddyhttp/fileserver/staticfiles.go b/modules/caddyhttp/fileserver/staticfiles.go index e91d06f1ab7..3d703280403 100644 --- a/modules/caddyhttp/fileserver/staticfiles.go +++ b/modules/caddyhttp/fileserver/staticfiles.go @@ -693,7 +693,7 @@ func (fsrv *FileServer) getEtagFromFile(fileSystem fs.FS, filename string) (stri } // Etags should not contain newline characters - etag = bytes.ReplaceAll(etag, []byte("\n"), []byte("")) + etag = bytes.ReplaceAll(etag, []byte("\n"), []byte{}) return string(etag), nil }