Skip to content
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.

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

Fix server disconnect when error after 100-continue #8876

Merged
merged 4 commits into from
Aug 26, 2024

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Aug 25, 2024

Fixes #5436.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 25, 2024
Copy link

codecov bot commented Aug 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.24%. Comparing base (48a5e07) to head (858f0ec).
Report is 1059 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8876   +/-   ##
=======================================
  Coverage   98.24%   98.24%           
=======================================
  Files         107      107           
  Lines       34110    34119    +9     
  Branches     4049     4050    +1     
=======================================
+ Hits        33511    33520    +9     
  Misses        423      423           
  Partials      176      176           
Flag Coverage Δ
CI-GHA 98.13% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.79% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.19% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.47% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.56% <100.00%> (-0.01%) ⬇️
Py-3.10.14 97.49% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.72% <100.00%> (+<0.01%) ⬆️
Py-3.12.4 95.99% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.46% <100.00%> (-0.01%) ⬇️
Py-3.9.19 97.39% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.00% <100.00%> (+<0.01%) ⬆️
VM-macos 97.47% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.79% <100.00%> (+<0.01%) ⬆️
VM-windows 96.19% <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.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note and removed bot:chronographer:skip This PR does not need to include a change note labels Aug 26, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 26, 2024
@Dreamsorcerer Dreamsorcerer merged commit e058cbd into master Aug 26, 2024
37 of 38 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-6 branch August 26, 2024 15:55
Copy link
Contributor

patchback bot commented Aug 26, 2024

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

❌ Failed to cleanly apply e058cbd on top of patchback/backports/3.10/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876

Backporting merged PR #8876 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/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876 upstream/3.10
  4. Now, cherry-pick PR Fix server disconnect when error after 100-continue #8876 contents into that branch:
    $ git cherry-pick -x e058cbd14dd754c2b0138fdef28df58c5e3a2c5f
    If it'll yell at you with something like fatal: Commit e058cbd14dd754c2b0138fdef28df58c5e3a2c5f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e058cbd14dd754c2b0138fdef28df58c5e3a2c5f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix server disconnect when error after 100-continue #8876 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876
  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.

Copy link
Contributor

patchback bot commented Aug 26, 2024

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

❌ Failed to cleanly apply e058cbd on top of patchback/backports/3.11/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876

Backporting merged PR #8876 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/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876 upstream/3.11
  4. Now, cherry-pick PR Fix server disconnect when error after 100-continue #8876 contents into that branch:
    $ git cherry-pick -x e058cbd14dd754c2b0138fdef28df58c5e3a2c5f
    If it'll yell at you with something like fatal: Commit e058cbd14dd754c2b0138fdef28df58c5e3a2c5f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e058cbd14dd754c2b0138fdef28df58c5e3a2c5f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix server disconnect when error after 100-continue #8876 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/e058cbd14dd754c2b0138fdef28df58c5e3a2c5f/pr-8876
  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 Aug 26, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 26, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 26, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

Server does not send an error response after sending 100-continue
2 participants