tls: do not wrap net.Socket with StreamWrap#12799
tls: do not wrap net.Socket with StreamWrap#12799krydos wants to merge 1 commit intonodejs:masterfrom
Conversation
|
Can you include a test that fails without this change? |
|
test added. Thank you @mscdex . test expect TypeError and do not check the exact error message. I did it like that mostly because test should check the fact that exception was thrown. |
|
/cc @nodejs/crypto |
|
Also, can you edit the commit message to add a |
|
@addaleax I've update commit message, thank you. And actually thank you for helping me to understand and fix the issue :) |
|
Labelled |
|
I think CI hates me 😢 Could you please approve I understand CI output correctly, and it is not related? |
|
@krydos gonna start a new one. CI 2: https://ci.nodejs.org/job/node-test-pull-request/7880/ |
There was a problem hiding this comment.
I know you commented on this already, but please check the full error message.
lib/_tls_wrap.js
Outdated
There was a problem hiding this comment.
Minor nit, lots of unnecessary parens. Do we allow them with lint?
There was a problem hiding this comment.
linter was quiet in this case. I'm also wasn't able to find rule to check this...
lib/_tls_wrap.js
Outdated
There was a problem hiding this comment.
I think @indutny was just talking about the inner parentheses – I would really prefer to keep the ones around the && expression for readability
There was a problem hiding this comment.
@addaleax oops, didn't understand it correctly. Sorry.
I've added parentheses around && expression. Thank you :)
|
Landed in b23d414 |
|
Looking back, I don’t think labelling this semver-major is necessary – I’d prefer to wait a bit before backporting, though. |
|
@addaleax agree with you. Looks more as a bugfix. I hope there are no users of Node.js who rely on this error. |
CitGM run: https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/796/ |
|
@gibfahn The “error” in this case is a failed C++ assertion (i.e. hard crash), just in case you were thinking this is about error messages. :) |
Fixes: nodejs#3655 PR-URL: nodejs#12799 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor@indutny.com>
|
I've thrown a baking for lts label on this PR... if the PR shouldn't land on v6.x please remove and add don't land label |
Hi :)
In this PR I just wanted to avoid "c-like" error from this issue - #3655. You can see below how error looks like now. At least there is stacktrace exist.
Please update me if I did something horribly wrong here or maybe if this is not a fix at all so I will close this PR.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)