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

Upgrade to llhttp 9.2 #8146

Merged
merged 5 commits into from
Feb 9, 2024
Merged

Upgrade to llhttp 9.2 #8146

merged 5 commits into from
Feb 9, 2024

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot labels Feb 8, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Feb 8, 2024
@Dreamsorcerer
Copy link
Member Author

@pajod Is test_parse_unusual_request_line and test_http_request_parser_utf8_request_line meant to be passing now? Still seems to be xfailing.

Copy link

codecov bot commented Feb 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3c0f1eb) 97.51% compared to head (ff03208) 97.51%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8146      +/-   ##
==========================================
- Coverage   97.51%   97.51%   -0.01%     
==========================================
  Files         107      107              
  Lines       32743    32733      -10     
  Branches     3829     3824       -5     
==========================================
- Hits        31930    31920      -10     
  Misses        612      612              
  Partials      201      201              
Flag Coverage Δ
CI-GHA 97.43% <ø> (-0.01%) ⬇️
OS-Linux 97.10% <ø> (-0.01%) ⬇️
OS-Windows 95.61% <ø> (-0.01%) ⬇️
OS-macOS 96.92% <ø> (-0.01%) ⬇️
Py-3.10.11 95.53% <ø> (-0.01%) ⬇️
Py-3.10.13 96.91% <ø> (-0.01%) ⬇️
Py-3.11.7 96.55% <ø> (-0.02%) ⬇️
Py-3.12.1 96.71% <ø> (+0.01%) ⬆️
Py-3.8.10 95.50% <ø> (-0.01%) ⬇️
Py-3.8.18 96.74% <ø> (-0.11%) ⬇️
Py-3.9.13 95.50% <ø> (-0.01%) ⬇️
Py-3.9.18 96.88% <ø> (-0.01%) ⬇️
Py-pypy7.3.15 96.42% <ø> (+0.01%) ⬆️
VM-macos 96.92% <ø> (-0.01%) ⬇️
VM-ubuntu 97.10% <ø> (-0.01%) ⬇️
VM-windows 95.61% <ø> (-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.

@pajod
Copy link
Contributor

pajod commented Feb 9, 2024

@Dreamsorcerer Expected and already the case when I introduced the other 2. Empty field name-intolerant llhttp just makes those 2 pass.

@Dreamsorcerer Dreamsorcerer merged commit 0ec65c0 into master Feb 9, 2024
31 of 34 checks passed
@Dreamsorcerer Dreamsorcerer deleted the llhttp-9.2 branch February 9, 2024 11:52
Copy link
Contributor

patchback bot commented Feb 9, 2024

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

❌ Failed to cleanly apply 0ec65c0 on top of patchback/backports/3.9/0ec65c0f4dc08d027f659256b09ae9cff10ab404/pr-8146

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

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

❌ Failed to cleanly apply 0ec65c0 on top of patchback/backports/3.10/0ec65c0f4dc08d027f659256b09ae9cff10ab404/pr-8146

Backporting merged PR #8146 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/0ec65c0f4dc08d027f659256b09ae9cff10ab404/pr-8146 upstream/3.10
  4. Now, cherry-pick PR Upgrade to llhttp 9.2 #8146 contents into that branch:
    $ git cherry-pick -x 0ec65c0f4dc08d027f659256b09ae9cff10ab404
    If it'll yell at you with something like fatal: Commit 0ec65c0f4dc08d027f659256b09ae9cff10ab404 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0ec65c0f4dc08d027f659256b09ae9cff10ab404
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upgrade to llhttp 9.2 #8146 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/0ec65c0f4dc08d027f659256b09ae9cff10ab404/pr-8146
  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 Feb 9, 2024
(cherry picked from commit 0ec65c0)
Dreamsorcerer added a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 0ec65c0)
Dreamsorcerer added a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 0ec65c0)
Dreamsorcerer added a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 0ec65c0)
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 backport-3.10 Trigger automatic backporting to the 3.10 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

2 participants