Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 20:45 UTC
Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" (#5924)
Mohammed Al Sahaf committed
Nov 1, 2023 at 20:17 UTC
3b3d67871446ee6bf1921938ef0f16b6112c7ceb
1 file changed
+1
-20
modules/caddyhttp/server.go
+1
-20
@@ -318,8 +318,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
318
// so we can track the number of bytes read from it
319
var bodyReader *lengthReader
320
if r.Body != nil {
321
- bodyReader = getLengthReader(r.Body)
322
- defer putLengthReader(bodyReader)
321
+ bodyReader = &lengthReader{Source: r.Body}
322
r.Body = bodyReader
323
}
324
@@ -903,24 +902,6 @@ type lengthReader struct {
902
Length int
903
}
904
906
-var lengthReaderPool = sync.Pool{
907
- New: func() interface{} {
908
- return &lengthReader{}
909
- },
910
-}
911
-
912
-func getLengthReader(source io.ReadCloser) *lengthReader {
913
- reader := lengthReaderPool.Get().(*lengthReader)
914
- reader.Source = source
915
- return reader
916
-}
917
-
918
-func putLengthReader(reader *lengthReader) {
919
- reader.Source = nil
920
- reader.Length = 0
921
- lengthReaderPool.Put(reader)
922
-}
923
-
905
func (r *lengthReader) Read(b []byte) (int, error) {
906
n, err := r.Source.Read(b)
907
r.Length += n