diff --git a/README.md b/README.md
index d3ffbd0145f..aa505e555bf 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Resources for Newcomers
- [nodejs.org](http://nodejs.org/)
- [how to install node.js and npm (node package manager)](http://joyeur.com/2010/12/10/installing-node-and-npm/)
- [list of modules](https://github.com/joyent/node/wiki/modules)
- - [searching the npm registry](http://search.npmjs.org/)
+ - [searching the npm registry](http://npmjs.org/)
- [list of companies and projects using node](https://github.com/joyent/node/wiki/Projects,-Applications,-and-Companies-Using-Node)
- [node.js mailing list](http://groups.google.com/group/nodejs)
- irc chatroom, [#node.js on freenode.net](http://webchat.freenode.net?channels=node.js&uio=d4)
diff --git a/doc/about/index.html b/doc/about/index.html
index 43422a662dd..f1dea6b243f 100644
--- a/doc/about/index.html
+++ b/doc/about/index.html
@@ -24,7 +24,7 @@
Home
Download
About
- npm Registry
+ npm Registry
Docs
Blog
@@ -116,7 +116,7 @@ console.log('Server running at http://127.0.0.1:1337/');
Node.js
Download
About
- npm Registry
+ npm Registry
Docs
Blog
Community
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index dade3235643..85c9c8b8d41 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -466,11 +466,6 @@ See also: `child_process.exec()` and `child_process.fork()`
* `command` {String} The command to run, with space-separated arguments
* `options` {Object}
* `cwd` {String} Current working directory of the child process
- * `stdio` {Array|String} Child's stdio configuration. (See above)
- Only stdin is configurable, anything else will lead to unpredictable
- results.
- * `customFds` {Array} **Deprecated** File descriptors for the child to use
- for stdio. (See above)
* `env` {Object} Environment key-value pairs
* `encoding` {String} (Default: 'utf8')
* `timeout` {Number} (Default: 0)
@@ -524,9 +519,6 @@ the child process is killed.
* `args` {Array} List of string arguments
* `options` {Object}
* `cwd` {String} Current working directory of the child process
- * `stdio` {Array|String} Child's stdio configuration. (See above)
- * `customFds` {Array} **Deprecated** File descriptors for the child to use
- for stdio. (See above)
* `env` {Object} Environment key-value pairs
* `encoding` {String} (Default: 'utf8')
* `timeout` {Number} (Default: 0)
diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown
index dd2fde06819..12bf26f31f8 100644
--- a/doc/api/stream.markdown
+++ b/doc/api/stream.markdown
@@ -549,6 +549,10 @@ Emitted when the stream's write queue empties and it's safe to write
without buffering again. Listen for it when `stream.write()` returns
`false`.
+### Event: 'error'
+
+Emitted if there was an error receiving data.
+
### Event: 'close'
Emitted when the underlying resource (for example, the backing file
diff --git a/doc/blog.html b/doc/blog.html
index 4aa9d8de38e..f6d9cf805b1 100644
--- a/doc/blog.html
+++ b/doc/blog.html
@@ -86,7 +86,7 @@
About
- npm
+ npm
Registry
Docs
@@ -213,7 +213,7 @@
Node.js
Download
About
- npm Registry
+ npm Registry
Docs
Blog
Community
diff --git a/doc/blog/Uncategorized/version-0-6.md b/doc/blog/Uncategorized/version-0-6.md
index 8dd9719e710..5cde4c61e7e 100644
--- a/doc/blog/Uncategorized/version-0-6.md
+++ b/doc/blog/Uncategorized/version-0-6.md
@@ -5,8 +5,19 @@ status: publish
category: Uncategorized
slug: version-0-6
-Version 0.6.0 will be released next week. Please spend some time this week upgrading your code to v0.5.10. Report any API differences at https://github.com/joyent/node/wiki/API-changes-between-v0.4-and-v0.6 or report a bug to us at http://github.com/joyent/node/issues if you hit problems.
+Version 0.6.0 will be released next week. Please spend some time this
+week upgrading your code to v0.5.10. Report any API differences at https://github.com/joyent/node/wiki/API-changes-between-v0.4-and-v0.6
+or report a bug to us at http://github.com/joyent/node/issues
+if you hit problems.
-The API changes between v0.4.12 and v0.5.10 are 99% cosmetic, minor, and easy to fix. Most people are able to migrate their code in 10 minutes. Don't fear.
+The API changes between v0.4.12 and v0.5.10 are 99% cosmetic, minor,
+and easy to fix. Most people are able to migrate their code in 10
+minutes. Don't fear.
-Once you've ported your code to v0.5.10 please help out by testing third party modules. Make bug reports. Encourage authors to publish new versions of their modules. Go through the list of modules at http://search.npmjs.org/ and try out random ones. This is especially encouraged of Windows users!
+Once you've ported your code to v0.5.10 please help out by testing
+third party modules. Make bug reports. Encourage authors to publish
+new versions of their modules. Go through the list of modules at http://npmjs.org/ and try out random
+ones. This is especially encouraged of Windows users!
diff --git a/doc/changelog-foot.html b/doc/changelog-foot.html
index 427359c8041..ff760e7c0b8 100644
--- a/doc/changelog-foot.html
+++ b/doc/changelog-foot.html
@@ -7,7 +7,7 @@
Node.js
Download
About
- npm Registry
+ npm Registry
Docs
Blog
Community
diff --git a/doc/changelog-head.html b/doc/changelog-head.html
index fdab340267d..946904d05d5 100644
--- a/doc/changelog-head.html
+++ b/doc/changelog-head.html
@@ -19,7 +19,7 @@
Home
Download
About
- npm Registry
+ npm Registry
Docs
Blog
diff --git a/doc/community/index.html b/doc/community/index.html
index 42a41407068..e47182d59e4 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -28,7 +28,7 @@
Home
Download
About
- npm Registry
+ npm Registry
Docs
Blog
@@ -93,7 +93,7 @@
Projects, Applications, and Companies Using Node or the
very long
list of Node modules, many of which are published in the
- npm registry.
+ npm registry.
@@ -223,7 +223,7 @@
Node.js
Download
About
- npm Registry
+ npm Registry
Docs
Blog
Community
diff --git a/doc/download/index.html b/doc/download/index.html
index a4559b620b9..c17f61bd3e8 100644
--- a/doc/download/index.html
+++ b/doc/download/index.html
@@ -24,7 +24,7 @@
Home
Download
About
- npm Registry
+ npm Registry
Docs
Blog
@@ -162,7 +162,7 @@
Node.js
Download
About
- npm Registry
+ npm Registry
Docs
Blog
Community
diff --git a/doc/index.html b/doc/index.html
index 65f200910bd..586ada181df 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -118,7 +118,7 @@ server.listen(1337, '127.0.0.1');
Explore Node.js
- About
Technical overview
- - npm Registry
Modules, resources and more
+ - npm Registry
Modules, resources and more
- Documentation
API Specifications
- Node.js Blog
Insight, perspective and events
- Community
Mailing lists, blogs, and more
@@ -134,7 +134,7 @@ server.listen(1337, '127.0.0.1');
- Node.js
- Download
- About
- - npm Registry
+ - npm Registry
- Docs
- Blog
- Community
diff --git a/doc/logos/index.html b/doc/logos/index.html
index c07d4c7dd5d..be0559252f4 100644
--- a/doc/logos/index.html
+++ b/doc/logos/index.html
@@ -24,7 +24,7 @@
- Home
- Download
- About
- - npm Registry
+ - npm Registry
- Docs
- Blog
@@ -68,7 +68,7 @@
- Node.js
- Download
- About
- - npm Registry
+ - npm Registry
- Docs
- Blog
- Community
diff --git a/doc/template.html b/doc/template.html
index 709c8e82343..7c40bede96a 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -19,7 +19,7 @@
- Home
- Download
- About
- - npm Registry
+ - npm Registry
- Docs
- Blog
@@ -58,7 +58,7 @@
- Node.js
- Download
- About
- - npm Registry
+ - npm Registry
- Docs
- Blog
- Community
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 070628288ee..07bd8b046ec 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -759,7 +759,6 @@ Readable.prototype.wrap = function(stream) {
if (chunk && chunk.length)
self.push(chunk);
}
- state.ended = true;
self.push(null);
});
@@ -767,7 +766,7 @@ Readable.prototype.wrap = function(stream) {
stream.on('data', function(chunk) {
if (state.decoder)
chunk = state.decoder.write(chunk);
- if (!chunk || !chunk.length)
+ if (!chunk || !state.objectMode && !chunk.length)
return;
var ret = self.push(chunk);
diff --git a/lib/child_process.js b/lib/child_process.js
index 1b6b8b21d62..f7312215cd8 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -336,8 +336,13 @@ function setupChannel(target, channel) {
var json = jsonBuffer.slice(start, i);
var message = JSON.parse(json);
- handleMessage(target, message, recvHandle);
- recvHandle = undefined;
+ // There will be at most one NODE_HANDLE message in every chunk we
+ // read because SCM_RIGHTS messages don't get coalesced. Make sure
+ // that we deliver the handle with the right message however.
+ if (message && message.cmd === 'NODE_HANDLE')
+ handleMessage(target, message, recvHandle);
+ else
+ handleMessage(target, message, undefined);
start = i + 1;
}
diff --git a/test/pummel/test-net-many-clients.js b/test/pummel/test-net-many-clients.js
index 3f394b8abe2..83ff1819903 100644
--- a/test/pummel/test-net-many-clients.js
+++ b/test/pummel/test-net-many-clients.js
@@ -37,12 +37,11 @@ for (var i = 0; i < bytes; i++) {
}
var server = net.createServer(function(c) {
- c.on('connect', function() {
- total_connections++;
- common.print('#');
- c.write(body);
- c.end();
- });
+ console.log('connected');
+ total_connections++;
+ common.print('#');
+ c.write(body);
+ c.end();
});
function runClient(callback) {
diff --git a/test/simple/test-child-process-recv-handle.js b/test/simple/test-child-process-recv-handle.js
new file mode 100644
index 00000000000..dce5bdcbaf7
--- /dev/null
+++ b/test/simple/test-child-process-recv-handle.js
@@ -0,0 +1,85 @@
+// 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.
+
+// Test that a Linux specific quirk in the handle passing protocol is handled
+// correctly. See https://github.com/joyent/node/issues/5330 for details.
+
+var common = require('../common');
+var assert = require('assert');
+var net = require('net');
+var spawn = require('child_process').spawn;
+
+if (process.argv[2] === 'worker')
+ worker();
+else
+ master();
+
+function master() {
+ // spawn() can only create one IPC channel so we use stdin/stdout as an
+ // ad-hoc command channel.
+ var proc = spawn(process.execPath, [__filename, 'worker'], {
+ stdio: ['pipe', 'pipe', 'pipe', 'ipc']
+ });
+ var handle = null;
+ proc.on('exit', function() {
+ handle.close();
+ });
+ proc.stdout.on('data', function(data) {
+ assert.equal(data, 'ok\r\n');
+ net.createServer(assert.fail).listen(common.PORT, function() {
+ handle = this._handle;
+ proc.send('one');
+ proc.send('two', handle);
+ proc.send('three');
+ proc.stdin.write('ok\r\n');
+ });
+ });
+ proc.stderr.pipe(process.stderr);
+}
+
+function worker() {
+ process._channel.readStop(); // Make messages batch up.
+ process.stdout.ref();
+ process.stdout.write('ok\r\n');
+ process.stdin.once('data', function(data) {
+ assert.equal(data, 'ok\r\n');
+ process._channel.readStart();
+ });
+ var n = 0;
+ process.on('message', function(msg, handle) {
+ n += 1;
+ if (n === 1) {
+ assert.equal(msg, 'one');
+ assert.equal(handle, undefined);
+ }
+ else if (n === 2) {
+ assert.equal(msg, 'two');
+ assert.equal(typeof handle, 'object'); // Also matches null, therefore...
+ assert.ok(handle); // also check that it's truthy.
+ handle.close();
+ }
+ else if (n === 3) {
+ assert.equal(msg, 'three');
+ assert.equal(handle, undefined);
+ process.exit();
+ }
+ });
+}
diff --git a/test/simple/test-stream2-readable-wrap-empty.js b/test/simple/test-stream2-readable-wrap-empty.js
new file mode 100644
index 00000000000..c7042f1b12e
--- /dev/null
+++ b/test/simple/test-stream2-readable-wrap-empty.js
@@ -0,0 +1,43 @@
+// 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.
+
+var common = require('../common');
+var assert = require('assert');
+
+var Readable = require('_stream_readable');
+var EE = require('events').EventEmitter;
+
+var oldStream = new EE();
+oldStream.pause = function(){};
+oldStream.resume = function(){};
+
+var newStream = new Readable().wrap(oldStream);
+
+var ended = false;
+newStream
+ .on('readable', function(){})
+ .on('end', function(){ ended = true; });
+
+oldStream.emit('end');
+
+process.on('exit', function(){
+ assert.ok(ended);
+});
\ No newline at end of file
diff --git a/test/simple/test-stream2-readable-wrap.js b/test/simple/test-stream2-readable-wrap.js
index 5fa5d185b55..6b272be46bf 100644
--- a/test/simple/test-stream2-readable-wrap.js
+++ b/test/simple/test-stream2-readable-wrap.js
@@ -26,69 +26,83 @@ var Readable = require('_stream_readable');
var Writable = require('_stream_writable');
var EE = require('events').EventEmitter;
-var old = new EE;
-var r = new Readable({ highWaterMark: 10 });
-assert.equal(r, r.wrap(old));
+var testRuns = 0, completedRuns = 0;
+function runTest(highWaterMark, objectMode, produce) {
+ testRuns++;
-var ended = false;
-r.on('end', function() {
- ended = true;
-});
+ var old = new EE;
+ var r = new Readable({ highWaterMark: highWaterMark, objectMode: objectMode });
+ assert.equal(r, r.wrap(old));
-var pauses = 0;
-var resumes = 0;
+ var ended = false;
+ r.on('end', function() {
+ ended = true;
+ });
-old.pause = function() {
- pauses++;
- old.emit('pause');
- flowing = false;
-};
+ var pauses = 0;
+ var resumes = 0;
-old.resume = function() {
- resumes++;
- old.emit('resume');
- flow();
-};
+ old.pause = function() {
+ pauses++;
+ old.emit('pause');
+ flowing = false;
+ };
-var flowing;
-var chunks = 10;
-var oldEnded = false;
-function flow() {
- flowing = true;
- while (flowing && chunks-- > 0) {
- old.emit('data', new Buffer('xxxxxxxxxx'));
+ old.resume = function() {
+ resumes++;
+ old.emit('resume');
+ flow();
+ };
+
+ var flowing;
+ var chunks = 10;
+ var oldEnded = false;
+ var expected = [];
+ function flow() {
+ flowing = true;
+ while (flowing && chunks-- > 0) {
+ var item = produce();
+ expected.push(item);
+ console.log('emit', chunks);
+ old.emit('data', item);
+ }
+ if (chunks <= 0) {
+ oldEnded = true;
+ console.log('old end', chunks, flowing);
+ old.emit('end');
+ }
}
- if (chunks <= 0) {
- oldEnded = true;
- old.emit('end');
+
+ var w = new Writable({ highWaterMark: highWaterMark * 2, objectMode: objectMode });
+ var written = [];
+ w._write = function(chunk, encoding, cb) {
+ console.log(chunk);
+ written.push(chunk);
+ setTimeout(cb);
+ };
+
+ w.on('finish', function() {
+ completedRuns++;
+ performAsserts();
+ });
+
+ r.pipe(w);
+
+ flow();
+
+ function performAsserts() {
+ assert(ended);
+ assert(oldEnded);
+ assert.deepEqual(written, expected);
+ assert.equal(pauses, 10);
+ assert.equal(resumes, 9);
}
}
-var w = new Writable({ highWaterMark: 20 });
-var written = [];
-w._write = function(chunk, encoding, cb) {
- written.push(chunk.toString());
- setTimeout(cb);
-};
-
-var finished = false;
-w.on('finish', function() {
- finished = true;
-});
-
-
-var expect = new Array(11).join('xxxxxxxxxx');
-
-r.pipe(w);
-
-flow();
+runTest(10, false, function(){ return new Buffer('xxxxxxxxxx'); });
+runTest(1, true, function(){ return { foo: 'bar' }; });
process.on('exit', function() {
- assert.equal(pauses, 10);
- assert.equal(resumes, 9);
- assert(ended);
- assert(finished);
- assert(oldEnded);
- assert.equal(written.join(''), expect);
+ assert.equal(testRuns, completedRuns);
console.log('ok');
});