From ce2a0404ae294b2e11e8bd2bea3f329180caccd4 Mon Sep 17 00:00:00 2001
From: Matteo Collina <hello@matteocollina.com>
Date: Tue, 12 Apr 2016 12:30:03 +0200
Subject: [PATCH] streams: support unlimited synchronous cork/uncork cycles

net streams can request multiple chunks to be written in a synchronous
fashion. If this is combined with cork/uncork, en error is currently
thrown because of a regression introduced in:
https://github.com/nodejs/node/commit/89aeab901ac9e34c79be3854f1aa41f2a4fb6888
(https://github.com/nodejs/node/pull/4354).

Fixes: https://github.com/nodejs/node/issues/6154.
---
 lib/_stream_writable.js             | 15 ++++++-----
 test/parallel/test-net-sync-cork.js | 41 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 test/parallel/test-net-sync-cork.js

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index b6e621fd1e3b78..98ca05da395458 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -112,10 +112,9 @@ function WritableState(options, stream) {
   // count buffered requests
   this.bufferedRequestCount = 0;
 
-  // create the two objects needed to store the corked requests
-  // they are not a linked list, as no new elements are inserted in there
+  // allocate the first CorkedRequest, there is always
+  // one allocated and free to use, and we maintain at most two
   this.corkedRequestsFree = new CorkedRequest(this);
-  this.corkedRequestsFree.next = new CorkedRequest(this);
 }
 
 WritableState.prototype.getBuffer = function writableStateGetBuffer() {
@@ -387,12 +386,16 @@ function clearBuffer(stream, state) {
 
     doWrite(stream, state, true, state.length, buffer, '', holder.finish);
 
-    // doWrite is always async, defer these to save a bit of time
+    // doWrite is almost always async, defer these to save a bit of time
     // as the hot path ends with doWrite
     state.pendingcb++;
     state.lastBufferedRequest = null;
-    state.corkedRequestsFree = holder.next;
-    holder.next = null;
+    if (holder.next) {
+      state.corkedRequestsFree = holder.next;
+      holder.next = null;
+    } else {
+      state.corkedRequestsFree = new CorkedRequest(state);
+    }
   } else {
     // Slow case, write chunks one-by-one
     while (entry) {
diff --git a/test/parallel/test-net-sync-cork.js b/test/parallel/test-net-sync-cork.js
new file mode 100644
index 00000000000000..b5f52947cff24e
--- /dev/null
+++ b/test/parallel/test-net-sync-cork.js
@@ -0,0 +1,41 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+
+const server = net.createServer(handle);
+
+const N = 100;
+const buf = Buffer.alloc(2, 'a');
+
+server.listen(common.PORT, function() {
+  const conn = net.connect(common.PORT);
+
+  conn.on('connect', () => {
+    let res = true;
+    let i = 0;
+    for (; i < N && res; i++) {
+      conn.cork();
+      conn.write(buf);
+      res = conn.write(buf);
+      conn.uncork();
+    }
+    assert.equal(i, N);
+    conn.end();
+  });
+});
+
+process.on('exit', function() {
+  assert.equal(server.connections, 0);
+});
+
+function handle(socket) {
+  socket.resume();
+
+  socket.on('error', function(err) {
+    socket.destroy();
+  }).on('close', function() {
+    server.close();
+  });
+}