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 Python parser chunked handling with multiple Transfer-Encoding values #8823

Merged
merged 5 commits into from
Aug 22, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #4436

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 21, 2024
aiohttp/http_parser.py Dismissed Show dismissed Hide dismissed
aiohttp/http_parser.py Dismissed Show dismissed Hide dismissed
Copy link

codecov bot commented Aug 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.24%. Comparing base (5be5af3) to head (a6c0481).
Report is 1074 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8823      +/-   ##
==========================================
+ Coverage   98.13%   98.24%   +0.10%     
==========================================
  Files         107      107              
  Lines       34075    34107      +32     
  Branches     4026     4050      +24     
==========================================
+ Hits        33441    33507      +66     
+ Misses        457      424      -33     
+ Partials      177      176       -1     
Flag Coverage Δ
CI-GHA 98.13% <100.00%> (+0.09%) ⬆️
OS-Linux 97.78% <100.00%> (+0.09%) ⬆️
OS-Windows 96.18% <100.00%> (+0.11%) ⬆️
OS-macOS 97.47% <100.00%> (+0.11%) ⬆️
Py-3.10.11 97.55% <100.00%> (+0.11%) ⬆️
Py-3.10.14 97.48% <100.00%> (+0.09%) ⬆️
Py-3.11.9 97.72% <100.00%> (+0.09%) ⬆️
Py-3.12.4 95.98% <100.00%> (-1.74%) ⬇️
Py-3.12.5 97.52% <100.00%> (+0.40%) ⬆️
Py-3.9.13 97.45% <100.00%> (+0.11%) ⬆️
Py-3.9.19 97.38% <100.00%> (+0.08%) ⬆️
Py-pypy7.3.16 96.99% <100.00%> (+0.08%) ⬆️
VM-macos 97.47% <100.00%> (+0.11%) ⬆️
VM-ubuntu 97.78% <100.00%> (+0.09%) ⬆️
VM-windows 96.18% <100.00%> (+0.11%) ⬆️

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.

@bdraco
Copy link
Member

bdraco commented Aug 21, 2024

LGTM sans the missing changelog message

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 22, 2024
@Dreamsorcerer Dreamsorcerer merged commit faa15fd into master Aug 22, 2024
34 of 35 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-py-parser-chunked branch August 22, 2024 12:47
Copy link
Contributor

patchback bot commented Aug 22, 2024

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

❌ Failed to cleanly apply faa15fd on top of patchback/backports/3.10/faa15fd7d1bea808a64f979c1a7ace8340d68d61/pr-8823

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

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

❌ Failed to cleanly apply faa15fd on top of patchback/backports/3.11/faa15fd7d1bea808a64f979c1a7ace8340d68d61/pr-8823

Backporting merged PR #8823 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/faa15fd7d1bea808a64f979c1a7ace8340d68d61/pr-8823 upstream/3.11
  4. Now, cherry-pick PR Fix Python parser chunked handling with multiple Transfer-Encoding values #8823 contents into that branch:
    $ git cherry-pick -x faa15fd7d1bea808a64f979c1a7ace8340d68d61
    If it'll yell at you with something like fatal: Commit faa15fd7d1bea808a64f979c1a7ace8340d68d61 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x faa15fd7d1bea808a64f979c1a7ace8340d68d61
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Python parser chunked handling with multiple Transfer-Encoding values #8823 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/faa15fd7d1bea808a64f979c1a7ace8340d68d61/pr-8823
  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 22, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 22, 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.

Differences in transfer encoding handling between the C and Python HTTP parsers
2 participants