Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fileserver: Remove newline characters from precomputed etags #6394

Merged
merged 3 commits into from
Jun 19, 2024
Merged

fileserver: Remove newline characters from precomputed etags #6394

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f161093
Removed newline characters from precomputed etags
armadi1809 Jun 13, 2024
04f1b27
Update modules/caddyhttp/fileserver/staticfiles.go
mholt Jun 15, 2024
df17b89
Merge branch 'master' into aar-trim-newline-from-etags
mholt Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/caddyhttp/fileserver/staticfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package fileserver

import (
"bytes"
"errors"
"fmt"
"io"
Expand Down Expand Up @@ -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
Expand Down
Loading