Skip to content

fix(fetch): preserve timeout cause on body errors #1126

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

Merged
ryanfowler merged 1 commit into from
Aug 24, 2026
Merged

fix(fetch): preserve timeout cause on body errors #1126

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
10 changes: 7 additions & 3 deletions internal/fetch/fetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,11 @@ func processResponse(ctx context.Context, r *Request, resp *http.Response, hadRe
if r.Discard {
_, err := io.Copy(io.Discard, resp.Body)
if err != nil {
return 0, err
// A canceled request closes the response body to unblock the read.
// The close can win the race and return a transport error instead of
// the context cause. Preserve the stable request timeout/cancellation
// error in that case.
return 0, contextCauseOr(err, ctx)
}
if r.Timing && bodyTimer != nil {
p := r.PrinterHandle.Stderr()
Expand All @@ -606,7 +610,7 @@ func processResponse(ctx context.Context, r *Request, resp *http.Response, hadRe

body, err := formatResponse(ctx, r, resp, cc)
if err != nil {
return 0, err
return 0, contextCauseOr(err, ctx)
}

if body == nil {
Expand All @@ -623,7 +627,7 @@ func processResponse(ctx context.Context, r *Request, resp *http.Response, hadRe
contentType := resp.Header.Get("Content-Type")
err = streamToStdoutWithPagerContent(ctx, body, p, forceRaw, r.NoPager, cc != nil || r.harRecorder != nil, r.Verbosity == core.VSilent, r.Pager, contentType)
if err != nil {
return 0, err
return 0, contextCauseOr(err, ctx)
}
}

Expand Down
Loading