Permalink
Browse files

net: handle 'finish' event only after 'connect'

  • Loading branch information...
1 parent 68487a7 commit eab57ff219bef14442c13de4c0916e328fb58c73 @indutny committed Mar 13, 2013
Showing with 47 additions and 0 deletions.
  1. +6 −0 lib/net.js
  2. +41 −0 test/simple/test-net-connect-immediate-finish.js
View
@@ -184,6 +184,12 @@ util.inherits(Socket, stream.Duplex);
// If allowHalfOpen is true, then we need to do a shutdown,
// so that only the writable side will be cleaned up.
function onSocketFinish() {
+ // If still connecting - defer handling 'finish' until 'connect' will happen
+ if (this._connecting) {
+ debug('osF: not yet connected');
+ return this.once('connect', onSocketFinish);
+ }
+
debug('onSocketFinish');
if (!this.readable || this._readableState.ended) {
debug('oSF: ended, destroy', this._readableState);
@@ -0,0 +1,41 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var net = require('net');
+
+var gotError = false;
+
+var client = net.connect({
+ host: 'no.way.you.will.resolve.this',
+ port: common.PORT
+});
+
+client.once('error', function(err) {
+ gotError = true;
+});
+
+client.end();
+
+process.on('exit', function() {
+ assert(gotError);
+});

0 comments on commit eab57ff

Please sign in to comment.