Fix cancellations being swallowed

[Dreamsorcerer]

Fixes #8174.
Fixes #8175.

[codecov]

Codecov Report

Attention: Patch coverage is 94.11765% with 4 lines in your changes missing coverage. Please review.

Project coverage is 98.41%. Comparing base (7e0ef07) to head (0b1bc0d).
Report is 1044 commits behind head on master.

✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
aiohttp/client_reqrep.py	76.47%	2 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #9030      +/-   ##
==========================================
- Coverage   98.42%   98.41%   -0.01%     
==========================================
  Files         107      107              
  Lines       34714    34765      +51     
  Branches     4116     4123       +7     
==========================================
+ Hits        34167    34214      +47     
  Misses        380      380              
- Partials      167      171       +4     

Flag	Coverage Δ
CI-GHA	98.30% <94.11%> (-0.01%)	⬇️
OS-Linux	97.96% <92.64%> (-0.01%)	⬇️
OS-Windows	96.35% <92.64%> (-0.01%)	⬇️
OS-macOS	97.64% <92.64%> (-0.01%)	⬇️
Py-3.10.11	97.62% <39.70%> (-0.12%)	⬇️
Py-3.10.15	97.56% <39.70%> (-0.12%)	⬇️
Py-3.11.10	97.52% <92.64%> (-0.06%)	⬇️
Py-3.11.9	97.59% <92.64%> (-0.06%)	⬇️
Py-3.12.6	98.02% <92.64%> (-0.01%)	⬇️
Py-3.9.13	97.52% <39.70%> (-0.11%)	⬇️
Py-3.9.20	97.46% <39.70%> (-0.11%)	⬇️
Py-pypy7.3.16	97.07% <39.70%> (-0.11%)	⬇️
VM-macos	97.64% <92.64%> (-0.01%)	⬇️
VM-ubuntu	97.96% <92.64%> (-0.01%)	⬇️
VM-windows	96.35% <92.64%> (-0.01%)	⬇️

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.

[webknjaz]

Seems like a good idea.

[patchback]

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

❌ Failed to cleanly apply 1a77ad9 on top of patchback/backports/3.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030

Backporting merged PR #9030 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.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030 upstream/3.10

4. Now, cherry-pick PR Fix cancellations being swallowed #9030 contents into that branch:

   $ git cherry-pick -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e

   If it'll yell at you with something like fatal: Commit 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR Fix cancellations being swallowed #9030 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/3.10/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030

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]

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

❌ Failed to cleanly apply 1a77ad9 on top of patchback/backports/3.11/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030

Backporting merged PR #9030 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.11/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030 upstream/3.11

4. Now, cherry-pick PR Fix cancellations being swallowed #9030 contents into that branch:

   $ git cherry-pick -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e

   If it'll yell at you with something like fatal: Commit 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR Fix cancellations being swallowed #9030 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/3.11/1a77ad933f07ab0e7ba0c16f7ca8f02fa8ab044e/pr-9030

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.