From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 5 Jul 2013 00:40:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v0.10'
X-Git-Tag: v0.11.4~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30e7d08d9316543367ca72678d8250f2afa4d105;p=platform%2Fupstream%2Fnodejs.git

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

Conflicts:
	lib/buffer.js
	lib/http.js
	src/node.cc
---

30e7d08d9316543367ca72678d8250f2afa4d105
diff --cc src/node.cc
index 08843cb,94af509..a9c11e0
--- a/src/node.cc
+++ b/src/node.cc
@@@ -883,8 -919,9 +883,9 @@@ Handle<Value> SetupDomainUse(const Argu
    Local<Function> ndt = ndt_v.As<Function>();
    process->Set(String::New("_tickCallback"), tdc);
    process->Set(String::New("nextTick"), ndt);
 -  process_tickCallback.Dispose();  // Possibly already set by MakeCallback().
 -  process_tickCallback = Persistent<Function>::New(tdc);
 -  return Undefined();
++  process_tickCallback.Dispose(node_isolate);  // May be set by MakeCallback().
 +  process_tickCallback = Persistent<Function>::New(node_isolate, tdc);
 +  return Undefined(node_isolate);
  }