Skip to content

fileserver: set Content-Length for precompressed files #7251

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

Merged
mholt merged 2 commits into from
Sep 11, 2025
Merged

fileserver: set Content-Length for precompressed files #7251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dba87f
set Content-Length for precompressed files
WeidiDeng Sep 11, 2025
63e3f53
Update modules/caddyhttp/fileserver/staticfiles.go
WeidiDeng Sep 11, 2025
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
10 changes: 5 additions & 5 deletions modules/caddyhttp/fileserver/staticfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,12 +458,12 @@ func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next c
defer file.Close()
respHeader.Set("Content-Encoding", ae)

// stdlib won't set Content-Length if Content-Encoding is set.
// set Range header if it's not present will force Content-Length to be set
// stdlib won't set Content-Length for non-range requests if Content-Encoding is set.
// see: https://github.com/caddyserver/caddy/issues/7040
// Setting the Range header manually will result in 206 Partial Content.
// see: https://github.com/caddyserver/caddy/issues/7250
if r.Header.Get("Range") == "" {
r.Header.Set("Range", "bytes=0-")
// remove this header, because it is not part of the request
defer r.Header.Del("Range")
respHeader.Set("Content-Length", strconv.FormatInt(compressedInfo.Size(), 10))
}

// try to get the etag from pre computed files if an etag suffix list was provided
Expand Down
Loading