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

Update to LLHTTP 9 #7485

Merged
merged 5 commits into from Aug 6, 2023
Merged

Update to LLHTTP 9 #7485

merged 5 commits into from Aug 6, 2023

Conversation

Dreamsorcerer
Copy link
Member

We already have a new version to upgrade to.

@Dreamsorcerer Dreamsorcerer added backport-3.8 backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot labels Aug 6, 2023
@@ -1,4 +1,4 @@
[submodule "vendor/llhttp"]
path = vendor/llhttp
url = https://github.com/nodejs/llhttp.git
branch = v8.x
branch = main
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no v9 branch. So, it looks like we'll be best just leaving it on main, and being sure to checkout a particular tag when updating.

aiohttp/_cparser.pxd Outdated Show resolved Hide resolved
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 6, 2023
@codecov
Copy link

codecov bot commented Aug 6, 2023

Codecov Report

Merging #7485 (e69596d) into master (1fb06bb) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #7485      +/-   ##
==========================================
- Coverage   97.27%   97.27%   -0.01%     
==========================================
  Files         106      106              
  Lines       31448    31441       -7     
  Branches     3567     3568       +1     
==========================================
- Hits        30592    30585       -7     
  Misses        652      652              
  Partials      204      204              
Flag Coverage Δ
CI-GHA 97.22% <100.00%> (-0.01%) ⬇️
OS-Linux 96.89% <100.00%> (-0.01%) ⬇️
OS-Windows 95.34% <100.00%> (-0.01%) ⬇️
OS-macOS 96.57% <100.00%> (-0.01%) ⬇️
Py-3.10.11 95.27% <100.00%> (-0.01%) ⬇️
Py-3.10.12 96.78% <100.00%> (-0.01%) ⬇️
Py-3.11.4 96.49% <0.00%> (-0.01%) ⬇️
Py-3.8.10 95.24% <100.00%> (-0.01%) ⬇️
Py-3.8.17 96.71% <100.00%> (-0.01%) ⬇️
Py-3.9.13 95.23% <100.00%> (-0.01%) ⬇️
Py-3.9.17 96.74% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.11 96.29% <0.00%> (-0.02%) ⬇️
VM-macos 96.57% <100.00%> (-0.01%) ⬇️
VM-ubuntu 96.89% <100.00%> (-0.01%) ⬇️
VM-windows 95.34% <100.00%> (-0.01%) ⬇️

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

Files Changed Coverage Δ
tests/test_http_parser.py 99.09% <100.00%> (-0.01%) ⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Dreamsorcerer Dreamsorcerer merged commit c0c7508 into master Aug 6, 2023
29 of 34 checks passed
@Dreamsorcerer Dreamsorcerer deleted the llhttp-9 branch August 6, 2023 14:33
@patchback
Copy link
Contributor

patchback bot commented Aug 6, 2023

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

❌ Failed to cleanly apply c0c7508 on top of patchback/backports/3.8/c0c7508b64951b83ea38d232857cc258159f930b/pr-7485

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

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

❌ Failed to cleanly apply c0c7508 on top of patchback/backports/3.9/c0c7508b64951b83ea38d232857cc258159f930b/pr-7485

Backporting merged PR #7485 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.9/c0c7508b64951b83ea38d232857cc258159f930b/pr-7485 upstream/3.9
  4. Now, cherry-pick PR Update to LLHTTP 9 #7485 contents into that branch:
    $ git cherry-pick -x c0c7508b64951b83ea38d232857cc258159f930b
    If it'll yell at you with something like fatal: Commit c0c7508b64951b83ea38d232857cc258159f930b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c0c7508b64951b83ea38d232857cc258159f930b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update to LLHTTP 9 #7485 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/c0c7508b64951b83ea38d232857cc258159f930b/pr-7485
  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 6, 2023
(cherry picked from commit c0c7508)
Dreamsorcerer added a commit that referenced this pull request Aug 6, 2023
(cherry picked from commit c0c7508)
Dreamsorcerer added a commit that referenced this pull request Aug 6, 2023
(cherry picked from commit c0c7508)
Dreamsorcerer added a commit that referenced this pull request Aug 6, 2023
(cherry picked from commit c0c7508)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.9 Trigger automatic backporting to the 3.9 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.

None yet

1 participant