From 63431796f4cdeb726cf8a4fe91806702cf09619c Mon Sep 17 00:00:00 2001
From: koichik <koichik@improvement.jp>
Date: Mon, 27 Feb 2012 04:13:08 +0900
Subject: [PATCH] net: fix race write() before and after connect()

Fixes #2827.
---
 lib/net.js                                  |  4 +-
 test/simple/test-net-write-connect-write.js | 48 +++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 test/simple/test-net-write-connect-write.js

diff --git a/lib/net.js b/lib/net.js
index e41e96ae1d386a..e915e09df4a32c 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -617,8 +617,6 @@ function afterConnect(status, handle, req, readable, writable) {
       handle.readStart();
     }
 
-    self.emit('connect');
-
     if (self._connectQueue) {
       debug('Drain the connect queue');
       for (var i = 0; i < self._connectQueue.length; i++) {
@@ -627,6 +625,8 @@ function afterConnect(status, handle, req, readable, writable) {
       self._connectQueueCleanUp();
     }
 
+    self.emit('connect');
+
     if (self._flags & FLAG_SHUTDOWNQUED) {
       // end called before connected - call end now with no data
       self._flags &= ~FLAG_SHUTDOWNQUED;
diff --git a/test/simple/test-net-write-connect-write.js b/test/simple/test-net-write-connect-write.js
new file mode 100644
index 00000000000000..cb65af8a808601
--- /dev/null
+++ b/test/simple/test-net-write-connect-write.js
@@ -0,0 +1,48 @@
+// 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 received = '';
+
+var server = net.createServer(function(socket) {
+  socket.pipe(socket);
+}).listen(common.PORT, function() {
+  var conn = net.connect(common.PORT);
+  conn.setEncoding('utf8');
+  conn.write('before');
+  conn.on('connect', function() {
+    conn.write('after');
+  });
+  conn.on('data', function(buf) {
+    received += buf;
+    conn.end();
+  });
+  conn.on('end', function() {
+    server.close();
+  });
+});
+
+process.on('exit', function() {
+  assert.equal(received, 'before' + 'after');
+});