Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

chore: encode: use FlushError instead of Flush (#6168)

Browse source 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
This commit is contained in:
WeidiDeng 2024-03-11 11:04:35 +08:00 committed by GitHub
parent e698ec5139
commit 1bd598e90c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/caddyhttp/encode/encode.go
View file

@ -232,18 +232,18 @@ func (enc *Encode) Match(rw *responseWriter) bool {
return enc.Matcher.Match(rw.statusCode, rw.Header()) 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
// until headers were written. // ResponseWriterWrapper until headers were written.
func (rw *responseWriter) Flush() { func (rw *responseWriter) FlushError() error {
if !rw.wroteHeader { if !rw.wroteHeader {
// flushing the underlying ResponseWriter will write header and status code, // 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 // 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 // therefore add the Content-Encoding header; this happens in the first call
// to rw.Write (see bug in #4314) // to rw.Write (see bug in #4314)
return return nil
} }
//nolint:bodyclose //nolint:bodyclose
http.NewResponseController(rw.ResponseWriter).Flush() return http.NewResponseController(rw.ResponseWriter).Flush()
} }
// Write writes to the response. If the response qualifies, // Write writes to the response. If the response qualifies,