From c8219d0e95490161f9bc2319c141df2d6d6d0948 Mon Sep 17 00:00:00 2001 From: Mohammed Al Sahaf Date: Wed, 1 Nov 2023 20:17:02 +0300 Subject: [PATCH] Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" (#5924) --- modules/caddyhttp/server.go | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go index b98619189..d060738f1 100644 --- a/modules/caddyhttp/server.go +++ b/modules/caddyhttp/server.go @@ -318,8 +318,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { // so we can track the number of bytes read from it var bodyReader *lengthReader if r.Body != nil { - bodyReader = getLengthReader(r.Body) - defer putLengthReader(bodyReader) + bodyReader = &lengthReader{Source: r.Body} r.Body = bodyReader } @@ -903,24 +902,6 @@ type lengthReader struct { Length int } -var lengthReaderPool = sync.Pool{ - New: func() interface{} { - return &lengthReader{} - }, -} - -func getLengthReader(source io.ReadCloser) *lengthReader { - reader := lengthReaderPool.Get().(*lengthReader) - reader.Source = source - return reader -} - -func putLengthReader(reader *lengthReader) { - reader.Source = nil - reader.Length = 0 - lengthReaderPool.Put(reader) -} - func (r *lengthReader) Read(b []byte) (int, error) { n, err := r.Source.Read(b) r.Length += n