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.1 #8292

Merged
merged 11 commits into from
Apr 5, 2024
Merged

Upgrade to llhttp 9.2.1 #8292

merged 11 commits into from
Apr 5, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #8291.

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

codecov bot commented Apr 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.57%. Comparing base (28f1fd8) to head (e545b19).
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8292      +/-   ##
==========================================
+ Coverage   97.49%   97.57%   +0.07%     
==========================================
  Files         107      107              
  Lines       32987    33085      +98     
  Branches     3853     3868      +15     
==========================================
+ Hits        32162    32282     +120     
+ Misses        606      587      -19     
+ Partials      219      216       -3     
Flag Coverage Δ
CI-GHA 97.48% <100.00%> (+0.06%) ⬆️
OS-Linux 97.15% <100.00%> (+0.06%) ⬆️
OS-Windows 95.65% <100.00%> (-0.07%) ⬇️
OS-macOS 96.86% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 95.50% <100.00%> (-0.07%) ⬇️
Py-3.10.14 96.95% <100.00%> (+<0.01%) ⬆️
Py-3.11.8 97.15% <100.00%> (+<0.01%) ⬆️
Py-3.12.2 97.27% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.42% <100.00%> (-0.12%) ⬇️
Py-3.8.18 96.80% <100.00%> (-0.09%) ⬇️
Py-3.9.13 95.47% <100.00%> (-0.07%) ⬇️
Py-3.9.18 ?
Py-3.9.19 96.93% <100.00%> (+0.03%) ⬆️
Py-pypy7.3.15 96.46% <100.00%> (?)
VM-macos 96.86% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.15% <100.00%> (+0.06%) ⬆️
VM-windows 95.65% <100.00%> (-0.07%) ⬇️

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 Apr 4, 2024

I'll give it a test now

@Dreamsorcerer
Copy link
Member Author

I think the only change is disabling obsolete line folding by default.

@bdraco
Copy link
Member

bdraco commented Apr 4, 2024

It looks quite safe. Not expecting any issues (but would rather not found out later)

Copy link
Member

@bdraco bdraco left a comment

Choose a reason for hiding this comment

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

Tested on production. Everything seems ok.

assert msg.method == "GET"
assert msg.path == "/test"
assert msg.code == 200
assert msg.reason == "Ok"
assert msg.version == (1, 1)
assert msg.headers == CIMultiDict({"data": "test " + value.decode()})
assert msg.raw_headers == ((b"data", b"test " + value),)
assert not msg.should_close
Copy link
Member Author

Choose a reason for hiding this comment

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

It would appear the C parser is setting this to True while the Python parser is setting it to False. I'm not sure of the significance of that... (This was probably already like that before this release, as I've switched the test to use the response parser).

Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is a bug nodejs/llhttp#354
Will just comment out the check to get this merged.

@Dreamsorcerer Dreamsorcerer merged commit 4d72dca into master Apr 5, 2024
36 of 37 checks passed
@Dreamsorcerer Dreamsorcerer deleted the llhttp branch April 5, 2024 18:23
Copy link
Contributor

patchback bot commented Apr 5, 2024

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

❌ Failed to cleanly apply 4d72dca on top of patchback/backports/3.9/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292

Backporting merged PR #8292 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/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292 upstream/3.9
  4. Now, cherry-pick PR Upgrade to llhttp 9.2.1 #8292 contents into that branch:
    $ git cherry-pick -x 4d72dca6869072fb073621f8b752225e216a92d9
    If it'll yell at you with something like fatal: Commit 4d72dca6869072fb073621f8b752225e216a92d9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4d72dca6869072fb073621f8b752225e216a92d9
  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.1 #8292 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292
  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 Apr 5, 2024

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

❌ Failed to cleanly apply 4d72dca on top of patchback/backports/3.10/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292

Backporting merged PR #8292 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/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292 upstream/3.10
  4. Now, cherry-pick PR Upgrade to llhttp 9.2.1 #8292 contents into that branch:
    $ git cherry-pick -x 4d72dca6869072fb073621f8b752225e216a92d9
    If it'll yell at you with something like fatal: Commit 4d72dca6869072fb073621f8b752225e216a92d9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4d72dca6869072fb073621f8b752225e216a92d9
  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.1 #8292 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/4d72dca6869072fb073621f8b752225e216a92d9/pr-8292
  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 Apr 5, 2024
Fixes #8291.

(cherry picked from commit 4d72dca)
Dreamsorcerer added a commit that referenced this pull request Apr 5, 2024
Fixes #8291.

(cherry picked from commit 4d72dca)
patchback bot pushed a commit that referenced this pull request Apr 5, 2024
Fixes #8291.

(cherry picked from commit 4d72dca)
(cherry picked from commit d15f07c)
Dreamsorcerer added a commit that referenced this pull request Apr 5, 2024
)

**This is a backport of PR #8297 as merged into 3.10
(d15f07c).**

Fixes #8291.

(cherry picked from commit 4d72dca)

Co-authored-by: Sam Bull <git@sambull.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Please update llhttp to 9.2.1
2 participants