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

http-parser -> llhttp #5364

Merged
merged 26 commits into from
Oct 27, 2021
Merged

http-parser -> llhttp #5364

merged 26 commits into from
Oct 27, 2021

Conversation

derlih
Copy link
Contributor

@derlih derlih commented Dec 22, 2020

What do these changes do?

Migrate from http-parser to llhttp

Are there changes in behavior for the user?

No

Related issue number

Closes #3561

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Dec 22, 2020
@derlih derlih linked an issue Dec 22, 2020 that may be closed by this pull request
@derlih derlih force-pushed the llhttp branch 2 times, most recently from be7cddf to 1a822e7 Compare December 22, 2020 14:15
@derlih derlih removed a link to an issue Dec 22, 2020
@derlih derlih changed the title WIP http-parser -> llhttp http-parser -> llhttp Dec 22, 2020
@greshilov
Copy link
Contributor

This PR deserves more attention IMHO. lhttp is an official replacement for the http_parser from nodejs developers.

@derlih Did you perform any benchmarking with this?

@derlih
Copy link
Contributor Author

derlih commented Jun 14, 2021

No I didn't. I created this PR just because lhttp is a replacement.

@davfsa
Copy link

davfsa commented Sep 13, 2021

Would like to bump this pr as http-parser is no longer maintained (nodejs/http-parser#522).

@greshilov There are some benchmarks up in llhttp's README (https://github.com/nodejs/llhttp#performance). Hope that is what you were looking for :)

Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

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

LGTM, amazing job!

Let's include it into aiohttp 3.8 and do battle testing.

@asvetlov asvetlov merged commit d379c6b into aio-libs:master Oct 27, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 27, 2021

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

❌ Failed to cleanly apply d379c6b on top of patchback/backports/3.8/d379c6b81fa32546c75a766e7a02b23851be29c6/pr-5364

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

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

@webknjaz webknjaz added this to the 3.8 milestone Oct 27, 2021
asvetlov added a commit that referenced this pull request Oct 27, 2021
@webknjaz
Copy link
Member

asvetlov added a commit that referenced this pull request Oct 27, 2021
@asvetlov
Copy link
Member

I see :(
#6143 reverts the commit, we need to investigate/fix tests first

asvetlov added a commit that referenced this pull request Oct 27, 2021
asvetlov added a commit that referenced this pull request Oct 27, 2021
@asvetlov asvetlov mentioned this pull request Oct 27, 2021
@socketpair
Copy link
Contributor

WOW

@v1gnesh v1gnesh mentioned this pull request Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Switch http_parser to llhttp
6 participants