Skip to content

Commit

Permalink
net: emit 'close' when socket ends before connect
Browse files Browse the repository at this point in the history
Don't set `writable` to true when a socket connects if the socket is
already in an ending state.

In the existing code, afterConnect always set `writable` to true.  This
has been the case for a long time, but previous to commit
9b7a691, the socket would still be
destroyed by `destroySoon` and emit a `'close'` event. Since that
commit removed this masking behavior, we have relied on maybeDestroy to
destroy the socket when the readble state is ended, and that won't
happen if `writable` is set to true.

If the socket has `allowHalfOpen` set to true, then `destroy` will still
not be called and `'close'` will not be emitted.

PR-URL: #21290
Fixes: #21268
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
  • Loading branch information
Brett Kiefer authored and targos committed Jun 19, 2018
1 parent 6285fe9 commit 18c057a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,8 @@ function afterConnect(status, handle, req, readable, writable) {

if (status === 0) {
self.readable = readable;
self.writable = writable;
if (!self._writableState.ended)
self.writable = writable;
self._unrefTimer();

self.emit('connect');
Expand Down
13 changes: 13 additions & 0 deletions test/parallel/test-net-socket-end-before-connect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
'use strict';

const common = require('../common');

const net = require('net');

const server = net.createServer();

server.listen(common.mustCall(() => {
const socket = net.createConnection(server.address().port);
socket.on('close', common.mustCall(() => server.close()));
socket.end();
}));

0 comments on commit 18c057a

Please sign in to comment.