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

writeBodyFixedSize: Only do an early flush if the reader is an *os.File #1674

Merged
merged 1 commit into from
Dec 2, 2023
Merged

writeBodyFixedSize: Only do an early flush if the reader is an *os.File #1674

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
17 changes: 13 additions & 4 deletions http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,10 +2104,19 @@ func limitedReaderSize(r io.Reader) int64 {

func writeBodyFixedSize(w *bufio.Writer, r io.Reader, size int64) error {
if size > maxSmallFileSize {
// w buffer must be empty for triggering
// sendfile path in bufio.Writer.ReadFrom.
if err := w.Flush(); err != nil {
return err
earlyFlush := false
switch r := r.(type) {
case *os.File:
earlyFlush = true
case *io.LimitedReader:
_, earlyFlush = r.R.(*os.File)
}
if earlyFlush {
// w buffer must be empty for triggering
// sendfile path in bufio.Writer.ReadFrom.
if err := w.Flush(); err != nil {
return err
}
}
}

Expand Down
Loading