Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: fix process.send() sync i/o regression #774

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
7 changes: 3 additions & 4 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
23 changes: 23 additions & 0 deletions test/parallel/test-child-process-sync-process-send.js
Original file line number Diff line number Diff line change
@@ -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);
}));
23 changes: 23 additions & 0 deletions test/parallel/test-net-sync-stdio.js
Original file line number Diff line number Diff line change
@@ -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);
}));