aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorWeidiDeng <[email protected]>2024-10-02 01:19:03 +0800
committerGitHub <[email protected]>2024-10-01 11:19:03 -0600
commitf3aead0e4df57716d525f3a25fb11f70bc72b20a (patch)
tree991361912b5446cfbee4cfa245e41fe603a65420
parent571f88d86f244d1d0211379c5aaad1ddada87fb1 (diff)
downloadcaddy-f3aead0e4df57716d525f3a25fb11f70bc72b20a.tar.gz
caddy-f3aead0e4df57716d525f3a25fb11f70bc72b20a.zip
http: ReponseWriter prefer ReadFrom if available (#6565)
Co-authored-by: Matt Holt <[email protected]>
-rw-r--r--modules/caddyhttp/responsewriter.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/caddyhttp/responsewriter.go b/modules/caddyhttp/responsewriter.go
index 808d2de3a..3c0f89d0b 100644
--- a/modules/caddyhttp/responsewriter.go
+++ b/modules/caddyhttp/responsewriter.go
@@ -42,9 +42,13 @@ func (rww *ResponseWriterWrapper) Push(target string, opts *http.PushOptions) er
return ErrNotImplemented
}
-// ReadFrom implements io.ReaderFrom. It simply calls io.Copy,
-// which uses io.ReaderFrom if available.
+// ReadFrom implements io.ReaderFrom. It retries to use io.ReaderFrom if available,
+// then fallback to io.Copy.
+// see: https://github.com/caddyserver/caddy/issues/6546
func (rww *ResponseWriterWrapper) ReadFrom(r io.Reader) (n int64, err error) {
+ if rf, ok := rww.ResponseWriter.(io.ReaderFrom); ok {
+ return rf.ReadFrom(r)
+ }
return io.Copy(rww.ResponseWriter, r)
}