From 976469ca0dbbbd948dbfd6a4caedb1e7c914ef3d Mon Sep 17 00:00:00 2001 From: WeidiDeng Date: Sun, 28 Jul 2024 07:46:56 +0800 Subject: encode: flush already compressed data from the encoder (#6471) --- modules/caddyhttp/encode/encode.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/caddyhttp/encode/encode.go b/modules/caddyhttp/encode/encode.go index cf3d17b69..00e507277 100644 --- a/modules/caddyhttp/encode/encode.go +++ b/modules/caddyhttp/encode/encode.go @@ -266,6 +266,14 @@ func (rw *responseWriter) FlushError() error { // to rw.Write (see bug in #4314) return nil } + // also flushes the encoder, if any + // see: https://github.com/jjiang-stripe/caddy-slow-gzip + if rw.w != nil { + err := rw.w.Flush() + if err != nil { + return err + } + } //nolint:bodyclose return http.NewResponseController(rw.ResponseWriter).Flush() } @@ -475,6 +483,7 @@ type encodingPreference struct { type Encoder interface { io.WriteCloser Reset(io.Writer) + Flush() error // encoder by default buffers data to maximize compressing rate } // Encoding is a type which can create encoders of its kind -- cgit v1.2.3