8000 Fix cancelled payload send leading to hung connection by Dreamsorcerer · Pull Request #8992 · aio-libs/aiohttp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix cancelled payload send leading to hung connection #8992

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
Merged
merged 5 commits into from
Sep 3, 2024
Merged

Fix cancelled payload send leading to hung connection #8992

merged 5 commits into from
Sep 3, 2024

Conversation

Dreamsorcerer
Copy link
Member

I've thought it through here, and I don't think we can safely reuse the connection at this point when we haven't finished sending the payload.
If it's not chunked, and therefore has a Content-Length, reusing the connection will result in the server thinking it's still reading the last message.
If it is chunked, then we can technically send a closing chunk to complete the message and then reuse it. However, that may lead the server to think that it has received the full message when it hasn't.

Fixes #7599.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 2, 2024
@codecov Codecov
Copy link
codecov bot commented Sep 2, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.29%. Comparing base (5c3d50f) to head (ba5e421).
Report is 1071 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #8992   +/-   ##
=======================================
  Coverage   98.28%   98.29%           
=======================================
  Files         107      107           
  Lines       34317    34320    +3     
  Branches     4064     4063    -1     
=======================================
+ Hits        33729    33734    +5     
+ Misses        415      413    -2     
  Partials      173      173
Flag Coverage Δ
CI-GHA 98.18% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.84% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.25% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.62% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.55% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.78% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.90% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.51% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.45% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.06% <100.00%> (+<0.01%) ⬆️
VM-macos 97.52% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.84% <100.00%> (+<0.01%) ⬆️
VM-windows 96.25% <100.00%> (+<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.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 2, 2024
@Dreamsorcerer Dreamsorcerer merged commit 5c0b8e4 into master Sep 3, 2024
34 of 35 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-client-conn-reuse branch September 3, 2024 12:37
@patchback Patchback
Copy link
Contributor
patchback bot commented Sep 3, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 5c0b8e4 on top of patchback/backports/3.10/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992

Backporting merged PR #8992 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/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992 upstream/3.10
  4. Now, cherry-pick PR Fix cancelled payload send leading to hung connection #8992 contents into that branch: 
    $ git cherry-pick -x 5c0b8e4a7897f48063f684ac16e7dd18f6218274
    If it'll yell at you with something like fatal: Commit 5c0b8e4a7897f48063f684ac16e7dd18f6218274 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 5c0b8e4a7897f48063f684ac16e7dd18f6218274
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix cancelled payload send leading to hung connection #8992 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/3.10/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992
  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 Patchback
Copy link
Contributor
patchback bot commented Sep 3, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 5c0b8e4 on top of patchback/backports/3.11/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992

Backporting merged PR #8992 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/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992 upstream/3.11
  4. Now, cherry-pick PR Fix cancelled payload send leading to hung connection #8992 contents into that branch: 
    $ git cherry-pick -x 5c0b8e4a7897f48063f684ac16e7dd18f6218274
    If it'll yell at you with something like fatal: Commit 5c0b8e4a7897f48063f684ac16e7dd18f6218274 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 5c0b8e4a7897f48063f684ac16e7dd18f6218274
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix cancelled payload send leading to hung connection #8992 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/3.11/5c0b8e4a7897f48063f684ac16e7dd18f6218274/pr-8992
  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 Sep 3, 2024
@Dreamsorcerer
Fix cancelled payload send leading to hung connection (#8992)
90a8f61 
(cherry picked from commit 5c0b8e4)
Dreamsorcerer added a commit that referenced this pull request Sep 3, 2024
@Dreamsorcerer
Fix cancelled payload send leading to hung connection (#8992)
8f9c17a 
(cherry picked from commit 5c0b8e4)
Dreamsorcerer added a commit that referenced this pull request Sep 3, 2024
@Dreamsorcerer
Fix cancelled payload send leading to hung connection (#8992) (#9002)
a3fa8d8 
(cherry picked from commit 5c0b8e4)
Dreamsorcerer added a commit that referenced this pull request Sep 3, 2024
@Dreamsorcerer
Fix cancelled payload send leading to hung connection (#8992) (#9003)
fecb85a 
(cherry picked from commit 5c0b8e4)
@booniepepper booniepepper mentioned this pull request Sep 3, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bdraco bdraco bdraco approved these changes

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

Assignees
No one assigned
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failed upload causes the next request to timeout
2 participants
@Dreamsorcerer @bdraco
0