aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWeidiDeng <[email protected]>2024-03-11 11:04:35 +0800
committerMatthew Holt <[email protected]>2024-09-26 11:32:54 -0600
commitc5d6b22f3748690102835f5c1d4d4a37039df51c (patch)
tree77152bac802e55217e0d810a0f4daa971674b276
parent898ef9f212b768e12cd95af897e46d7896950aeb (diff)
downloadcaddy-c5d6b22f3748690102835f5c1d4d4a37039df51c.tar.gz
caddy-c5d6b22f3748690102835f5c1d4d4a37039df51c.zip
chore: encode: use FlushError instead of Flush (#6168)
Co-authored-by: Francis Lavoie <[email protected]>
-rw-r--r--modules/caddyhttp/encode/encode.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go
index e2649031b..4bc390008 100644
--- a/modules/caddyhttp/encode/encode.go
+++ b/modules/caddyhttp/encode/encode.go
@@ -202,15 +202,15 @@ 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
-// until headers were written.
-func (rw *responseWriter) Flush() {
+// FlushError is an alternative Flush returning an error. It delays the actual Flush of the underlying
+// ResponseWriterWrapper until headers were written.
+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
}
// also flushes the encoder, if any
// see: https://github.com/jjiang-stripe/caddy-slow-gzip
@@ -221,7 +221,7 @@ func (rw *responseWriter) Flush() {
}
}
//nolint:bodyclose
- http.NewResponseController(rw.ResponseWriter).Flush()
+ return http.NewResponseController(rw.ResponseWriter).Flush()
}
// Hijack implements http.Hijacker. It will flush status code if set. We don't track actual hijacked