Skip to content

[1.96] backport: Add global HTTP timeout tracking to http_async#17131

Merged
weihanglo merged 3 commits into
rust-lang:rust-1.96.0from
arlosi:stable-196-cp-timeout-tracking
Jun 23, 2026
Merged

[1.96] backport: Add global HTTP timeout tracking to http_async#17131
weihanglo merged 3 commits into
rust-lang:rust-1.96.0from
arlosi:stable-196-cp-timeout-tracking

Conversation

@arlosi

@arlosi arlosi commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Backport #16903 to 1.96 stable.

  • Fix for retrying spurious HTTP errors coming from curl
  • Changes timeouts to more closely match behavior prior to async conversion

arlosi added 3 commits June 23, 2026 13:16
This brings http_async up to match how the .crate downloader
works in terms of having a global HTTP timeout handled by cargo
rather than setting the parameters on each curl handle.
This is a fix, since we were not correctly retrying errors from
curl when using http_async.
@rustbot rustbot added A-networking Area: networking issues, curl, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 23, 2026
@rustbot

rustbot commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ehuss, @epage, @weihanglo
  • @ehuss, @epage, @weihanglo expanded to ehuss, epage, weihanglo
  • Random selection from ehuss, epage, weihanglo

@rustbot

rustbot commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.96.0. Please double check that you specified the right target!

@weihanglo weihanglo merged commit 92844f9 into rust-lang:rust-1.96.0 Jun 23, 2026
29 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2026
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Jun 24, 2026
[stable] 1.96.1 release

This prepares 1.96.1 release with:

- [Cargo: fix timeout/retry behavior](rust-lang/cargo#17131)
- [rustc: fix unsoundness in MIR opt](#158214)

Currently targeting this Thursday.

r? me
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-networking Area: networking issues, curl, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants