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

Jump to bottom

chore: encode: use FlushError instead of Flush #6168

Merged
merged 3 commits into from
Mar 11, 2024
Merged

chore: encode: use FlushError instead of Flush #6168

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f14bb
use FlushError instead of Flush
WeidiDeng Mar 11, 2024
81ba7e7
balance comment length
WeidiDeng Mar 11, 2024
7dd73e6
fix lint
WeidiDeng Mar 11, 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
8 changes: 4 additions & 4 deletions modules/caddyhttp/encode/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,18 @@ func (enc *Encode) Match(rw *responseWriter) bool {
return enc.Matcher.Match(rw.statusCode, rw.Header())
}

// Flush implements http.Flusher. It delays the actual Flush of the underlying ResponseWriterWrapper
// FlushError is an alternative Flush returning an error. It delays the actual Flush of the underlying ResponseWriterWrapper
// until headers were written.
WeidiDeng marked this conversation as resolved.
Show resolved Hide resolved
func (rw *responseWriter) Flush() {
func (rw *responseWriter) FlushError() error {
if !rw.wroteHeader {
// flushing the underlying ResponseWriter will write header and status code,
// but we need to delay that until we can determine if we must encode and
// therefore add the Content-Encoding header; this happens in the first call
// to rw.Write (see bug in #4314)
return
return nil
}
//nolint:bodyclose
http.NewResponseController(rw.ResponseWriter).Flush()
return http.NewResponseController(rw.ResponseWriter).Flush()
}

// Write writes to the response. If the response qualifies,
Expand Down
Loading