Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" #5924

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" #5924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions modules/caddyhttp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
Expand Down
Loading