Commit f54659c
net: simplify net.Socket#end()
`writable` is already set by the streams side, and
there is a handler waiting for the writable side to finish
which already takes care of the other cleanup code that
was previously there; both of these things can therefore be removed.
PR-URL: #18708
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>1 parent 47dfe29 commit f54659c
1 file changed
Lines changed: 2 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -496,18 +496,10 @@ Socket.prototype._read = function(n) { | |||
| 496 | 496 | }; | |
| 497 | 497 | ||
| 498 | 498 | ||
| 499 | - Socket.prototype.end = function(data, encoding) { | ||
| 500 | - stream.Duplex.prototype.end.call(this, data, encoding); | ||
| 501 | - this.writable = false; | ||
| 499 | + Socket.prototype.end = function(data, encoding, callback) { | ||
| 500 | + stream.Duplex.prototype.end.call(this, data, encoding, callback); | ||
| 502 | 501 | DTRACE_NET_STREAM_END(this); | |
| 503 | 502 | LTTNG_NET_STREAM_END(this); | |
| 504 | - | ||
| 505 | - // just in case we're waiting for an EOF. | ||
| 506 | - if (this.readable && !this._readableState.endEmitted) | ||
| 507 | - this.read(0); | ||
| 508 | - else | ||
| 509 | - maybeDestroy(this); | ||
| 510 | - | ||
| 511 | 503 | return this; | |
| 512 | 504 | }; | |
| 513 | 505 | ||
0 commit comments