tls: accept empty net.Sockets
#1046
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Accept `new net.Socket()` as a `socket` option to `tls.connect()` without triggering an assertion error in C++. This is done by wrapping it into a JSStream to ensure that there will be a handle at the time of wrapping the socket into TLSSocket. Fix: nodejs#987
| @@ -506,6 +513,7 @@ TLSSocket.prototype._start = function() { | |||
| return; | |||
| } | |||
|
|
|||
| debug('start'); | |||
There was a problem hiding this comment.
Yeah, I'm tired of putting console.log() here during debugging :)
|
LGTM. What does the CI say? |
|
does the test cover the same reduced case you narrowed down in #987? |
|
Yes. |
|
|
I have no opinion on which one of the two options to presented in
|
@rvagg second one is actually a continuation of this. I decided to do the simple first and harder later :) |
indutny
added a commit
that referenced
this pull request
Mar 3, 2015
Accept `new net.Socket()` as a `socket` option to `tls.connect()` without triggering an assertion error in C++. This is done by wrapping it into a JSStream to ensure that there will be a handle at the time of wrapping the socket into TLSSocket. Fix: #987 PR-URL: #1046 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rod Vagg <rod@vagg.org>
|
Landed in 7b3b8ac, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Accept
new net.Socket()as asocketoption totls.connect()without triggering an assertion error in C++.
This is done by wrapping it into a JSStream to ensure that there will be
a handle at the time of wrapping the socket into TLSSocket.
Fix: #987
cc @iojs/streams @iojs/crypto @iojs/collaborators