Skip to content

Drop additional headers on redirect#12146

Merged
Dreamsorcerer merged 8 commits intomasterfrom
Dreamsorcerer-patch-6
Feb 27, 2026
Merged

Drop additional headers on redirect#12146
Dreamsorcerer merged 8 commits intomasterfrom
Dreamsorcerer-patch-6

Conversation

@Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added the bot:chronographer:skip This PR does not need to include a change note label Feb 26, 2026
@Dreamsorcerer Dreamsorcerer added backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot labels Feb 26, 2026
@codecov
Copy link

codecov bot commented Feb 26, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (master@830ae44). Learn more about missing BASE report.
⚠️ Report is 2 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff            @@
##             master   #12146   +/-   ##
=========================================
  Coverage          ?   98.78%           
=========================================
  Files             ?      128           
  Lines             ?    45321           
  Branches          ?     2405           
=========================================
  Hits              ?    44772           
  Misses            ?      390           
  Partials          ?      159           
Flag Coverage Δ
CI-GHA 98.64% <100.00%> (?)
OS-Linux 98.38% <100.00%> (?)
OS-Windows 96.75% <100.00%> (?)
OS-macOS 97.63% <100.00%> (?)
Py-3.10.11 97.19% <100.00%> (?)
Py-3.10.19 97.66% <100.00%> (?)
Py-3.11.14 97.86% <100.00%> (?)
Py-3.11.9 97.39% <100.00%> (?)
Py-3.12.10 97.48% <100.00%> (?)
Py-3.12.12 97.95% <100.00%> (?)
Py-3.13.12 98.20% <100.00%> (?)
Py-3.14.3 98.16% <100.00%> (?)
Py-3.14.3t 97.26% <100.00%> (?)
Py-pypy3.11.13-7.3.20 97.30% <100.00%> (?)
VM-macos 97.63% <100.00%> (?)
VM-ubuntu 98.38% <100.00%> (?)
VM-windows 96.75% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@codspeed-hq
Copy link

codspeed-hq bot commented Feb 26, 2026

Merging this PR will not alter performance

✅ 59 untouched benchmarks


Comparing Dreamsorcerer-patch-6 (8049ce0) with master (c0f1513)

Open in CodSpeed

@Dreamsorcerer Dreamsorcerer merged commit 6e8f393 into master Feb 27, 2026
42 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-6 branch February 27, 2026 00:27
@patchback
Copy link
Contributor

patchback bot commented Feb 27, 2026

Backport to 3.13: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6e8f393 on top of patchback/backports/3.13/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146

Backporting merged PR #12146 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.13/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146 upstream/3.13
  4. Now, cherry-pick PR Drop additional headers on redirect #12146 contents into that branch:
    $ git cherry-pick -x 6e8f393330f9bd6d7b24a146124ebc42eaa727b9
    If it'll yell at you with something like fatal: Commit 6e8f393330f9bd6d7b24a146124ebc42eaa727b9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 6e8f393330f9bd6d7b24a146124ebc42eaa727b9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Drop additional headers on redirect #12146 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.13/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link
Contributor

patchback bot commented Feb 27, 2026

Backport to 3.14: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 6e8f393 on top of patchback/backports/3.14/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146

Backporting merged PR #12146 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.14/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146 upstream/3.14
  4. Now, cherry-pick PR Drop additional headers on redirect #12146 contents into that branch:
    $ git cherry-pick -x 6e8f393330f9bd6d7b24a146124ebc42eaa727b9
    If it'll yell at you with something like fatal: Commit 6e8f393330f9bd6d7b24a146124ebc42eaa727b9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 6e8f393330f9bd6d7b24a146124ebc42eaa727b9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Drop additional headers on redirect #12146 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.14/6e8f393330f9bd6d7b24a146124ebc42eaa727b9/pr-12146
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Dreamsorcerer added a commit that referenced this pull request Feb 27, 2026
Dreamsorcerer added a commit that referenced this pull request Feb 27, 2026
Dreamsorcerer added a commit that referenced this pull request Feb 27, 2026
Dreamsorcerer added a commit that referenced this pull request Feb 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant