Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[v11.x backport] tls cleanups #25968

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
Closed
sam-github wants to merge 2 commits into from
Closed

[v11.x backport] tls cleanups #25968

sam-github wants to merge 2 commits into from

Conversation

@sam-github
Copy link
Contributor

@sam-github sam-github commented Feb 6, 2019 •
edited by addaleax
Loading

Backport of #25861 and #25929

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Feb 6, 2019

@sam-github build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/2530/pipeline

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. v11.x labels Feb 6, 2019
@sam-github sam-github force-pushed the backport-25861-to-v11.x branch from 3a80599 to 7fa600f Compare February 6, 2019 20:11
@sam-github sam-github mentioned this pull request Feb 6, 2019
Closed
3 tasks
@addaleax
Copy link
Member

addaleax commented Feb 6, 2019

Looks like the Travis failure is real?

mhdawson
mhdawson approved these changes Feb 6, 2019
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@sam-github
src: refactor SSLError case statement
22f6d4d 
- Don't use both break and return simultaneously.
- Use case:/UNREACHABLE() to enforce that all cases are handled, instead
  of CHECK().

Backport-PR-URL: nodejs#25968
PR-URL: nodejs#25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@sam-github
tls: in-line comments and other cleanups
29f040a 
PR-URL: nodejs#25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Backport-PR-URL: nodejs#25968
@sam-github
Copy link
Contributor Author

sam-github commented Feb 7, 2019

I dropped tls: null not valid as a renegotiate callback, its not semver-major in itself, but its a fix to a check that is not being merged down to 11.x because it is semver-major: #25876

The other two can be landed on 11.x

@sam-github sam-github force-pushed the backport-25861-to-v11.x branch from 7fa600f to 29f040a Compare February 7, 2019 22:16
@targos
Copy link
Member

targos commented Feb 8, 2019

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

@addaleax
Copy link
Member

addaleax commented Feb 8, 2019

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

@addaleax
Copy link
Member

addaleax commented Feb 8, 2019

Landed in 7cf484c, fb83f84

@addaleax addaleax closed this Feb 8, 2019
addaleax pushed a commit that referenced this pull request Feb 8, 2019
@sam-github @addaleax
src: refactor SSLError case statement
7cf484c 
- Don't use both break and return simultaneously.
- Use case:/UNREACHABLE() to enforce that all cases are handled, instead
  of CHECK().

Backport-PR-URL: #25968
PR-URL: #25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
addaleax pushed a commit that referenced this pull request Feb 8, 2019
@sam-github @addaleax
tls: in-line comments and other cleanups
fb83f84 
PR-URL: #25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Backport-PR-URL: #25968

Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@sam-github sam-github deleted the backport-25861-to-v11.x branch February 9, 2019 01:29
sam-github added a commit to sam-github/node that referenced this pull request Apr 29, 2019
@sam-github
src: refactor SSLError case statement
5febe41 
- Don't use both break and return simultaneously.
- Use case:/UNREACHABLE() to enforce that all cases are handled, instead
  of CHECK().

Backport-PR-URL: nodejs#25968
PR-URL: nodejs#25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@addaleax addaleax addaleax approved these changes

@mhdawson mhdawson mhdawson approved these changes

Assignees

No one assigned

Labels

c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sam-github @nodejs-github-bot @addaleax @targos @mhdawson
Morty Proxy This is a proxified and sanitized view of the page, visit original site.