net: unref timer in parent sockets #891
Closed
+52
−9
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
`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from `TLSSocket` do not touch the timers of original `net.Socket`. Introduce `socket._parent` property, and iterate through all parents to unref timers and prevent timeout event on original `net.Socket`. Fix: nodejs/node-v0.x-archive#9242
|
cc @iojs/crypto |
| @@ -445,7 +446,8 @@ Socket.prototype._destroy = function(exception, cb) { | |||
|
|
|||
| this.readable = this.writable = false; | |||
|
|
|||
| timers.unenroll(this); | |||
| for (var s = this; s !== null; s = s._parent) | |||
There was a problem hiding this comment.
I wonder if it might be worth adding this as a helper function.
| @@ -213,6 +213,8 @@ function TLSSocket(socket, options) { | |||
| readable: false, | |||
| writable: false | |||
| }); | |||
| if (socket) | |||
| this._parent = socket; | |||
There was a problem hiding this comment.
why not combine the 2 following lines into one if statement like:
if (socket)
this._parent = socket,
this._connecting = socket._connecting;
|
LGTM if the tests pass |
indutny
added a commit
that referenced
this pull request
Feb 19, 2015
`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from `TLSSocket` do not touch the timers of original `net.Socket`. Introduce `socket._parent` property, and iterate through all parents to unref timers and prevent timeout event on original `net.Socket`. Fix: nodejs/node-v0.x-archive#9242 PR-URL: #891 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
|
Landed in 9b6b055, thank you! |
indutny
added a commit
to nodejs/node-v0.x-archive
that referenced
this pull request
Feb 19, 2015
`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from `TLSSocket` do not touch the timers of original `net.Socket`. Introduce `socket._parent` property, and iterate through all parents to unref timers and prevent timeout event on original `net.Socket`. Fix: #9242 PR-URL: nodejs/node#891 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This was referenced Sep 15, 2021
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.
TLSSocketwraps the originalnet.Socket, but writes/reads to/fromTLSSocketdo not touch the timers of originalnet.Socket.Introduce
socket._parentproperty, and iterate through all parentsto unref timers and prevent timeout event on original
net.Socket.Fix: nodejs/node-v0.x-archive#9242