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.

Sign up for GitHub

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

Jump to bottom

deps: fix llhttp version number #43029

Closed
wants to merge 1 commit into from
Closed

deps: fix llhttp version number #43029

wants to merge 1 commit into from

Conversation

mhdawson
Copy link
Member

@mhdawson mhdawson commented May 9, 2022

It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson mdawson@devrus.com

@mhdawson
deps: fix llhttp version number
c3bb288 
It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson <mdawson@devrus.com>
@nodejs-github-bot
Copy link
Collaborator

Review requested:

  • @nodejs/http
  • @nodejs/net

@nodejs-github-bot nodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. labels May 9, 2022
@mhdawson
Copy link
Member Author

mhdawson commented May 9, 2022 •
edited
Loading

@mcollina I think you are probably the best person to confirm this as I think you did the update to pull the newer llhttp version into Node.js.

I was initially confused when I tried to recreate llhttp as part of documenting how to do an update in #43028. I checked out llhttp version v6.0.4 in the llhttp repo, generated and copied on top of what we had in Node.js master. I was confused in that there were a number of fixes that seemed to be missing.

After some poking around I then did the same with 6.0.6 and after the copy the only changes were

  • the version change in this PR
  • a difference in spacing in one of the files
  • Some changes to the README.md, at least one explained by the rename of the primary branch to main.

From that I think we have the version tagged as v6.0.6 in the llhttp repo in Node.js.

mcollina
mcollina approved these changes May 10, 2022
View reviewed changes
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

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

lgtm, likely my bad.

@richardlau
Copy link
Member

@mcollina I think you are probably the best person to confirm this as I think you did the update to pull the newer llhttp version into Node.js.

I was initially confused when I tried to recreate llhttp as part of documenting how to do an update in #43028. I checked out llhttp version v6.0.4 in the llhttp repo, generated and copied on top of what we had in Node.js master. I was confused in that there were a number of fixes that seemed to be missing.

After some poking around I then did the same with 6.0.6 and after the copy the only changes were

  • the version change in this PR
  • a difference in spacing in one of the files
  • Some changes to the README.md, at least one explained by the rename of the primary branch to main.

From that I think we have the version tagged as v6.0.6 in the llhttp repo in Node.js.

I'm fairly certain this isn't the first time the version number has gone out of sync with upstream llhttp, and it happens when we have security issues that involve llhttp updates -- we have historically applied the llhttp patches directly to the private Node.js repository, released the security release and then @indutny cuts a new llhttp release shortly after. In this case we're not updating directly from llhttp upstream as documented in #43028.

@mhdawson
Copy link
Member Author

@richardlau we should probably think a bit more about the security update process to see if there is anything we can do on that front.

@mhdawson mhdawson added the request-ci Add this label to start a Jenkins CI on a PR. label May 10, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 10, 2022
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/43940/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/43944/

@github-actions github-actions bot mentioned this pull request May 12, 2022
Open
30 tasks
mhdawson added a commit that referenced this pull request May 12, 2022
@mhdawson
deps: fix llhttp version number
c059921 
It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson <mdawson@devrus.com>

PR-URL: #43029
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@mhdawson
Copy link
Member Author

Landed in c059921

@mhdawson mhdawson closed this May 12, 2022
This was referenced May 12, 2022
Closed
Open
Open
Open
Open
BethGriggs pushed a commit that referenced this pull request May 16, 2022
@mhdawson @BethGriggs
deps: fix llhttp version number
a4a4f71 
It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson <mdawson@devrus.com>

PR-URL: #43029
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@RafaelGSS RafaelGSS mentioned this pull request May 16, 2022
Merged
@github-actions github-actions bot mentioned this pull request May 17, 2022
Open
23 tasks
juanarbol pushed a commit that referenced this pull request May 31, 2022
@mhdawson @juanarbol
deps: fix llhttp version number
973cd67 
It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson <mdawson@devrus.com>

PR-URL: #43029
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@juanarbol juanarbol mentioned this pull request May 31, 2022
Closed
danielleadams pushed a commit that referenced this pull request Jun 27, 2022
@mhdawson @danielleadams
deps: fix llhttp version number
224108f 
It's a bit confusing but I think that we acutally have
llhttp version 6.0.6 in master versus 6.0.4. If I check
out 6.0.4 from the llhttp repo and then generate a
release it is missing changes from what we have in Node.js
Checking out 6.0.6 seems to give the matching release
artifacts.

Signed-off-by: Michael Dawson <mdawson@devrus.com>

PR-URL: #43029
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardlau richardlau richardlau approved these changes

@tniessen tniessen tniessen approved these changes

@lpinca lpinca lpinca approved these changes

@mcollina mcollina mcollina approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mhdawson @nodejs-github-bot @richardlau @mcollina @lpinca @tniessen @targos