From 26dae9a22a75e814a30f3f8093ea8ac627cdef16 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor.indutny@gmail.com>
Date: Wed, 13 Mar 2013 16:53:27 +0400
Subject: [PATCH] net: handle 'finish' event only after 'connect'

---
 lib/net.js                                    |  6 +++
 .../test-net-connect-immediate-finish.js      | 41 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 test/simple/test-net-connect-immediate-finish.js

diff --git a/lib/net.js b/lib/net.js
index b994c27814..9541e1beea 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -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);
diff --git a/test/simple/test-net-connect-immediate-finish.js b/test/simple/test-net-connect-immediate-finish.js
new file mode 100644
index 0000000000..ac2a61331d
--- /dev/null
+++ b/test/simple/test-net-connect-immediate-finish.js
@@ -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);
+});