From 1fea45840fe226dea7b3ed7f72840b01295b4138 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 9 Feb 2015 22:41:15 +0100
Subject: [PATCH] lib: fix stdio/ipc sync i/o regression

process.send() should be synchronous, it should block until the message
has been sent in full, but it wasn't after the second-to-last libuv
upgrade because of commit libuv/libuv@393c1c5 ("unix: set non-block
mode in uv_{pipe,tcp,udp}_open"), which made its way into io.js in
commit 07bd05b ("deps: update libuv to 1.2.1").

Commit libuv/libuv@b36d4ff ("unix: implement uv_stream_set_blocking()")
as landed in io.js in commit 9681fca ("deps: update libuv to 1.4.0")
makes it possible to restore the synchronous behavior again and that's
precisely what this commit does.

The same line of reasoning applies to `net.Socket({ fd: 1 })`: creating
a socket object from a stdio file descriptor, like the `process.stdout`
getter does, should put the file descriptor in blocking mode for
compatibility reasons.

Fixes: https://github.com/iojs/io.js/issues/760
Fixes: https://github.com/iojs/io.js/issues/784
---
 lib/child_process.js                          |  7 ++++++
 lib/net.js                                    |  7 +++---
 .../test-child-process-sync-process-send.js   | 23 +++++++++++++++++++
 test/parallel/test-net-sync-stdio.js          | 23 +++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-child-process-sync-process-send.js
 create mode 100644 test/parallel/test-net-sync-stdio.js

diff --git a/lib/child_process.js b/lib/child_process.js
index 5fcd2603940d6d..3fcf527a41dcab 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -566,6 +566,13 @@ exports._forkChild = function(fd) {
   // set process.send()
   var p = createPipe(true);
   p.open(fd);
+
+  // p.open() puts the file descriptor in non-blocking mode
+  // but it must be synchronous for backwards compatibility.
+  var err = p.setBlocking(true);
+  if (err)
+    throw errnoException(err, 'setBlocking');
+
   p.unref();
   setupChannel(process, p);
 
diff --git a/lib/net.js b/lib/net.js
index 030083d3f40983..73c3846fa434d3 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -134,10 +134,9 @@ function Socket(options) {
   } else if (options.fd !== undefined) {
     this._handle = createHandle(options.fd);
     this._handle.open(options.fd);
-    if ((options.fd == 1 || options.fd == 2) &&
-        (this._handle instanceof Pipe) &&
-        process.platform === 'win32') {
-      // Make stdout and stderr blocking on Windows
+    // this._handle.open() puts the file descriptor in non-blocking
+    // mode but it must be synchronous for backwards compatibility.
+    if ((options.fd == 1 || options.fd == 2) && this._handle instanceof Pipe) {
       var err = this._handle.setBlocking(true);
       if (err)
         throw errnoException(err, 'setBlocking');
diff --git a/test/parallel/test-child-process-sync-process-send.js b/test/parallel/test-child-process-sync-process-send.js
new file mode 100644
index 00000000000000..0126c870309248
--- /dev/null
+++ b/test/parallel/test-child-process-sync-process-send.js
@@ -0,0 +1,23 @@
+var common = require('../common');
+var assert = require('assert');
+var fork = require('child_process').fork;
+var N = 4 << 20;  // 4 MB
+
+for (var big = '*'; big.length < N; big += big);
+
+if (process.argv[2] === 'child') {
+  process.send(big);
+  process.exit(42);
+}
+
+var proc = fork(__filename, ['child']);
+
+proc.on('message', common.mustCall(function(msg) {
+  assert.equal(typeof msg, 'string');
+  assert.equal(msg.length, N);
+  assert.equal(msg, big);
+}));
+
+proc.on('exit', common.mustCall(function(exitCode) {
+  assert.equal(exitCode, 42);
+}));
diff --git a/test/parallel/test-net-sync-stdio.js b/test/parallel/test-net-sync-stdio.js
new file mode 100644
index 00000000000000..46dff29596d600
--- /dev/null
+++ b/test/parallel/test-net-sync-stdio.js
@@ -0,0 +1,23 @@
+var common = require('../common');
+var assert = require('assert');
+var spawn = require('child_process').spawn;
+var N = 4 << 20;  // 4 MB
+
+for (var big = '*'; big.length < N; big += big);
+
+if (process.argv[2] === 'child') {
+  process.stdout.write(big);
+  process.exit(42);
+}
+
+var stdio = ['inherit', 'pipe', 'inherit'];
+var proc = spawn(process.execPath, [__filename, 'child'], { stdio: stdio });
+
+var chunks = [];
+proc.stdout.setEncoding('utf8');
+proc.stdout.on('data', chunks.push.bind(chunks));
+
+proc.on('exit', common.mustCall(function(exitCode) {
+  assert.equal(exitCode, 42);
+  assert.equal(chunks.join(''), big);
+}));