Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

net: fix race write() before and after connect()

Fixes #2827.
  • Loading branch information...
koichik committed Feb 26, 2012
1 parent 692bcbe commit 63431796f4cdeb726cf8a4fe91806702cf09619c
Showing with 50 additions and 2 deletions.
  1. +2 −2 lib/net.js
  2. +48 −0 test/simple/test-net-write-connect-write.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;
@@ -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');
});

0 comments on commit 6343179

Please sign in to comment.
You can’t perform that action at this time.