Showing with 7 additions and 85 deletions.

+7 −1 lib/net.js

+0 −84 test/simple/test-net-many-small-writes.js
diff --git a/lib/net.js b/lib/net.js
@@ -601,8 +601,14 @@ Socket.prototype._write = function(dataEncoding, cb) {
     return this._destroy(errnoException(errno, 'write'), cb);
 
   writeReq.oncomplete = afterWrite;
-  writeReq.cb = cb;
   this._bytesDispatched += writeReq.bytes;
+
+  // If it was entirely flushed, we can write some more right now.
+  // However, if more is left in the queue, then wait until that clears.
+  if (this._handle.writeQueueSize === 0)
+    cb();
+  else
+    writeReq.cb = cb;
 };
 
 function createWriteReq(handle, data, encoding) {

diff --git a/test/simple/test-net-many-small-writes.js b/test/simple/test-net-many-small-writes.js