Merge remote-tracking branch 'upstream/v0.10'

Reverted 9520adeb37f5ebe02a68669ec97770f4869705bb

Conflicts:
	deps/cares/src/ares_parse_txt_reply.c
	deps/uv/.mailmap
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/include/uv.h
	deps/uv/src/unix/error.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	deps/uv/src/win/pipe.c
	deps/uv/src/win/signal.c
	deps/uv/src/win/util.c
	deps/uv/test/test-spawn.c
	deps/uv/vcbuild.bat
	deps/v8/src/platform-posix.cc
	deps/v8/tools/gyp/v8.gyp
	lib/util.js
	src/node.cc
	test/simple/test-util-format.js
	test/simple/test-util.js

1 files changed, 65 insertions, 0 deletions

diff --git a/test/simple/test-cluster-send-deadlock.js b/test/simple/test-cluster-send-deadlock.js
new file mode 100644
index 0000000000..1b4a90dee0
--- /dev/null
+++ b/test/simple/test-cluster-send-deadlock.js
@@ -0,0 +1,65 @@
+// 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.
+
+// Testing mutual send of handles: from master to worker, and from worker to
+// master.
+
+var common = require('../common');
+var assert = require('assert');
+var cluster = require('cluster');
+var net = require('net');
+
+if (cluster.isMaster) {
+  var worker = cluster.fork();
+  worker.on('exit', function(code, signal) {
+    assert.equal(code, 0, 'Worker exited with an error code');
+    assert(!signal, 'Worker exited by a signal');
+    server.close();
+  });
+
+  var server = net.createServer(function(socket) {
+    worker.send('handle', socket);
+  });
+
+  server.listen(common.PORT, function() {
+    worker.send('listen');
+  });
+} else {
+  process.on('message', function(msg, handle) {
+    if (msg === 'listen') {
+      var client1 = net.connect({ host: 'localhost', port: common.PORT });
+      var client2 = net.connect({ host: 'localhost', port: common.PORT });
+      var waiting = 2;
+      client1.on('close', onclose);
+      client2.on('close', onclose);
+      function onclose() {
+        if (--waiting === 0)
+          cluster.worker.disconnect();
+      }
+      setTimeout(function() {
+        client1.end();
+        client2.end();
+      }, 50);
+    } else {
+      process.send('reply', handle);
+    }
+  });
+}