summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammed Al Sahaf <msaa1990@gmail.com>2023-11-01 20:17:02 +0300
committerMatthew Holt <mholt@users.noreply.github.com>2023-12-07 13:26:21 -0700
commitc8219d0e95490161f9bc2319c141df2d6d6d0948 (patch)
treee31759acaecdf6fccb8b410cd9d00b011f9d8dbf
parent36fce3fa18eeebc36f4cb42299337fa7cc98487d (diff)
Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" (#5924)
-rw-r--r--modules/caddyhttp/server.go21
1 files changed, 1 insertions, 20 deletions
diff --git a/modules/caddyhttp/server.go b/modules/caddyhttp/server.go
index b9861918..d060738f 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