From 5ec056633f4ce1a19058dbb55a24e9d0dff3c183 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 21 Jun 2012 16:03:48 -0700 Subject: [PATCH] Fix #3503: stdin: resume() on pipe(dest) --- src/node.js | 8 +++++ test/simple/test-stdin-pipe-resume.js | 48 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 test/simple/test-stdin-pipe-resume.js diff --git a/src/node.js b/src/node.js index 6a202fbce1..891fec143f 100644 --- a/src/node.js +++ b/src/node.js @@ -400,6 +400,14 @@ // know yet. Call pause() explicitly to unref() it. stdin.pause(); + // when piping stdin to a destination stream, + // let the data begin to flow. + var pipe = stdin.pipe; + stdin.pipe = function(dest) { + stdin.resume(); + return pipe.call(stdin, dest); + }; + return stdin; }); diff --git a/test/simple/test-stdin-pipe-resume.js b/test/simple/test-stdin-pipe-resume.js new file mode 100644 index 0000000000..163d8369c9 --- /dev/null +++ b/test/simple/test-stdin-pipe-resume.js @@ -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. + +// This tests that piping stdin will cause it to resume() as well. +var common = require('../common'); +var assert = require('assert'); + +if (process.argv[2] === 'child') { + process.stdin.pipe(process.stdout); +} else { + var spawn = require('child_process').spawn; + var buffers = []; + var child = spawn(process.execPath, [__filename, 'child']); + child.stdout.on('data', function(c) { + buffers.push(c); + }); + child.stdout.on('close', function() { + var b = Buffer.concat(buffers).toString(); + assert.equal(b, 'Hello, world\n'); + console.log('ok'); + }); + child.stdin.write('Hel'); + child.stdin.write('lo,'); + child.stdin.write(' wo'); + setTimeout(function() { + child.stdin.write('rld\n'); + child.stdin.end(); + }, 10); +} +