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

Conflicts:
	deps/uv/ChangeLog
	deps/uv/build.mk
	deps/uv/src/version.c
	deps/uv/test/test-ipc.c
	deps/v8/src/objects.cc
	src/node.cc
	src/node_os.cc

diff --cc doc/api/cluster.markdown
Simple merge

diff --cc doc/api/stream.markdown
Simple merge

diff --cc lib/_stream_writable.js
index 6404821,403cb7b..276b001
--- 1/lib/_stream_writable.js
--- 2/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@@ -236,12 -203,14 +236,14 @@@ function writeOrBuffer(stream, state, c
    state.length += len;
  
    var ret = state.length < state.highWaterMark;
-   state.needDrain = !ret;
+   // we must ensure that previous needDrain will not be reset to false.
+   if (!ret)
+     state.needDrain = true;
  
 -  if (state.writing)
 +  if (state.writing || state.corked)
      state.buffer.push(new WriteReq(chunk, encoding, cb));
    else
 -    doWrite(stream, state, len, chunk, encoding, cb);
 +    doWrite(stream, state, false, len, chunk, encoding, cb);
  
    return ret;
  }

diff --cc src/node.cc
index a39459c,a18e0d8..f8cd15b
--- 1/src/node.cc
--- 2/src/node.cc
+++ b/src/node.cc
@@@ -1997,34 -1914,21 +1997,31 @@@ static void OnFatalError(const char* lo
    } else {
      fprintf(stderr, "FATAL ERROR: %s\n", message);
    }
- #if defined(DEBUG)
 +  fflush(stderr);
    abort();
- #endif
-   exit(5);
  }
  
 -void FatalException(TryCatch &try_catch) {
 -  HandleScope scope;
  
 -  if (fatal_exception_symbol.IsEmpty())
 -    fatal_exception_symbol = NODE_PSYMBOL("_fatalException");
 +NO_RETURN void FatalError(const char* location, const char* message) {
 +  OnFatalError(location, message);
 +  // to supress compiler warning
 +  abort();
 +}
  
 -  Local<Value> fatal_v = process->Get(fatal_exception_symbol);
  
 -  if (!fatal_v->IsFunction()) {
 +void FatalException(Handle<Value> error, Handle<Message> message) {
 +  HandleScope scope(node_isolate);
 +
 +  Environment* env = Environment::GetCurrent(node_isolate);
 +  Local<Object> process_object = env->process_object();
 +  Local<String> fatal_exception_string = env->fatal_exception_string();
 +  Local<Function> fatal_exception_function =
 +      process_object->Get(fatal_exception_string).As<Function>();
 +
 +  if (!fatal_exception_function->IsFunction()) {
      // failed before the process._fatalException function was added!
      // this is probably pretty bad.  Nothing to do but report and exit.
 -    ReportException(try_catch, true);
 +    ReportException(error, message);
      exit(6);
    }
  

diff --cc src/node_os.cc
index bed5a09,07f73f4..14dc6e0
--- 1/src/node_os.cc
--- 2/src/node_os.cc
+++ b/src/node_os.cc
@@@ -221,15 -205,18 +221,18 @@@ static void GetInterfaceAddresses(cons
    Local<String> name, family;
    Local<Array> ifarr;
  
 -  uv_err_t err = uv_interface_addresses(&interfaces, &count);
 +  int err = uv_interface_addresses(&interfaces, &count);
-   if (err) {
-     return ThrowUVException(err, "uv_interface_addresses");
-   }
  
    ret = Object::New();
  
 -  if (err.code == UV_ENOSYS)
 -    return scope.Close(ret);
 -
 -  if (err.code != UV_OK)
 -    return ThrowException(UVException(err.code, "uv_interface_addresses"));
++  if (err == UV_ENOSYS) {
++    args.GetReturnValue().Set(ret);
++  } else if (err) {
++    return ThrowUVException(err, "uv_interface_addresses");
++  }
+ 
    for (i = 0; i < count; i++) {
 -    name = String::New(interfaces[i].name);
 +    name = OneByteString(node_isolate, interfaces[i].name);
      if (ret->Has(name)) {
        ifarr = Local<Array>::Cast(ret->Get(name));
      } else {

diff --cc test/simple/test-abort-fatal-error.js
index 0000000,81c4ca5..d5d8866
mode 000000,100644..100644
--- /dev/null
--- 2/test/simple/test-abort-fatal-error.js
+++ b/test/simple/test-abort-fatal-error.js
@@@ -1,0 -1,39 +1,39 @@@
 -cmdline += ' --max-old-space-size=1 --max-new-space-size=1';
 -cmdline += ' -e "setInterval(function() { new Buffer(1024); }, 1);"';
+ // 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 assert = require('assert');
+ var common = require('../common');
+ 
+ if (process.platform === 'win32') {
+   console.log('skipping test on windows');
+   process.exit(0);
+ }
+ 
+ var exec = require('child_process').exec;
+ 
+ var cmdline = 'ulimit -c 0; ' + process.execPath;
++cmdline += ' --max-old-space-size=4 --max-new-space-size=1';
++cmdline += ' -e "a = []; for (i = 0; i < 1e9; i++) { a.push({}) }"';
+ 
+ exec(cmdline, function(err, stdout, stderr) {
+   assert(err);
+   assert(stderr.toString().match(/abort/i));
+ });

diff --cc test/simple/test-debugger-client.js
index 21ddf5e,6480e1c..af3be21
--- 1/test/simple/test-debugger-client.js
--- 2/test/simple/test-debugger-client.js
+++ b/test/simple/test-debugger-client.js
@@@ -201,16 -197,17 +201,21 @@@ function doTest(cb, done) 
            connectCount++;
            console.log('ready!');
            cb(c, function() {
-             console.error('>>> killing node process %d\n\n', nodeProcess.pid);
-             nodeProcess.kill();
-             done();
+             c.end();
+             c.on('end', function() {
+               console.error(
+                   '>>> killing node process %d\n\n',
+                   nodeProcess.pid);
+               nodeProcess.kill();
+               done();
+             });
            });
          });
 -      });
 +        c.on('error', function(err) {
 +          if (err.code !== 'ECONNREFUSED') throw err;
 +          setTimeout(tryConnect, 10);
 +        });
 +      }
      }
    });
  }