diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown index 2d48f24751..b82eb5700e 100644 --- a/doc/api/cluster.markdown +++ b/doc/api/cluster.markdown @@ -242,18 +242,6 @@ Example: Spawn a new worker process. This can only be called from the master process. -## cluster.settings - -* {Object} - * `exec` {String} file path to worker file. Default: `__filename` - * `args` {Array} string arguments passed to worker. - (Default=`process.argv.slice(2)`) - * `silent` {Boolean} whether or not to send output to parent's stdio. - (Default=`false`) - -All settings set by the `.setupMaster` is stored in this settings object. -This object is not supposed to be change or set manually. - ## cluster.disconnect([callback]) * `callback` {Function} called when all workers are disconnected and handlers are closed diff --git a/lib/fs.js b/lib/fs.js index ae9cdf4c4d..51dfe56293 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -87,14 +87,14 @@ fs.Stats.prototype.isSocket = function() { }; fs.exists = function(path, callback) { - binding.stat(path, function(err, stats) { + binding.stat(pathModule._makeLong(path), function(err, stats) { if (callback) callback(err ? false : true); }); }; fs.existsSync = function(path) { try { - binding.stat(path); + binding.stat(pathModule._makeLong(path)); return true; } catch (e) { return false; diff --git a/lib/http.js b/lib/http.js index 01aa4ebde8..f7b2f786b6 100644 --- a/lib/http.js +++ b/lib/http.js @@ -1482,9 +1482,7 @@ ClientRequest.prototype.onSocket = function(socket) { parser.incoming = null; req.parser = parser; - parser.socket = socket; socket.parser = parser; - parser.incoming = null; socket._httpMessage = req; // Setup "drain" propogation. diff --git a/src/node.cc b/src/node.cc index 84792d9800..aa8548750c 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2453,11 +2453,35 @@ static void ParseArgs(int argc, char **argv) { static Isolate* node_isolate = NULL; static volatile bool debugger_running = false; + +static uv_async_t dispatch_debug_messages_async; + + +// Called from the main thread. +static void DispatchDebugMessagesAsyncCallback(uv_async_t* handle, int status) { + v8::Debug::ProcessDebugMessages(); +} + + +// Called from V8 Debug Agent TCP thread. +static void DispatchMessagesDebugAgentCallback() { + uv_async_send(&dispatch_debug_messages_async); +} + + static void EnableDebug(bool wait_connect) { // If we're called from another thread, make sure to enter the right // v8 isolate. node_isolate->Enter(); + v8::Debug::SetDebugMessageDispatchHandler(DispatchMessagesDebugAgentCallback, + false); + + uv_async_init(uv_default_loop(), + &dispatch_debug_messages_async, + DispatchDebugMessagesAsyncCallback); + uv_unref((uv_handle_t*) &dispatch_debug_messages_async); + // Start the debug thread and it's associated TCP server on port 5858. bool r = v8::Debug::EnableAgent("node " NODE_VERSION, debug_port, diff --git a/test/simple/test-regress-GH-3739.js b/test/simple/test-regress-GH-3739.js new file mode 100644 index 0000000000..937068795a --- /dev/null +++ b/test/simple/test-regress-GH-3739.js @@ -0,0 +1,66 @@ +// 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.js'), + assert = require('assert'), + fs = require('fs'), + path = require('path'); + +var dir = path.resolve(common.fixturesDir), + dirs = []; + +// Make a long path. +for (var i = 0; i < 50; i++) { + dir = dir + '/123456790'; + try { + fs.mkdirSync(dir, '0777'); + } catch (e) { + if (e.code == 'EEXIST') { + // Ignore; + } else { + cleanup(); + throw e; + } + } + dirs.push(dir); +} + +// Test existsSync +var r = fs.existsSync(dir); +if (r !== true) { + cleanup(); + throw new Error('fs.existsSync returned false'); +} + +// Text exists +fs.exists(dir, function(r) { + cleanup(); + if (r !== true) { + throw new Error('fs.exists reported false'); + } +}); + +// Remove all created directories +function cleanup() { + for (var i = dirs.length - 1; i >= 0; i--) { + fs.rmdirSync(dirs[i]); + } +}