From 7becf156a92180c9b6455f60b143e18729592dfb Mon Sep 17 00:00:00 2001
From: Andreas Madsen <amwebdk@gmail.com>
Date: Tue, 26 Feb 2013 18:26:09 +0100
Subject: [PATCH] timers: consistent this keyword in setImmediate

When calling setImmediate with extra arguments the this keyword in the
callback would refer to the global object, but when not calling
setImmediate with extra arguments this would refer to the returned
handle object.

This commit fixes that inconsistency so its always set handle object.
The handle object was chosen for performance reasons.
---
 lib/timers.js                   |  2 +-
 test/simple/test-timers-this.js | 64 +++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 test/simple/test-timers-this.js

diff --git a/lib/timers.js b/lib/timers.js
index 68890ab9f74..989050538ee 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -324,7 +324,7 @@ exports.setImmediate = function(callback) {
     args = Array.prototype.slice.call(arguments, 1);
 
     immediate._onImmediate = function() {
-      callback.apply(null, args);
+      callback.apply(immediate, args);
     };
   }
 
diff --git a/test/simple/test-timers-this.js b/test/simple/test-timers-this.js
new file mode 100644
index 00000000000..3d23e61dff1
--- /dev/null
+++ b/test/simple/test-timers-this.js
@@ -0,0 +1,64 @@
+// 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 immediateThis, intervalThis, timeoutThis,
+    immediateArgsThis, intervalArgsThis, timeoutArgsThis;
+
+var immediateHandler = setImmediate(function () {
+  immediateThis = this;
+});
+
+var immediateArgsHandler = setImmediate(function () {
+  immediateArgsThis = this;
+}, "args ...");
+
+var intervalHandler = setInterval(function () {
+  clearInterval(intervalHandler);
+
+  intervalThis = this;
+});
+
+var intervalArgsHandler = setInterval(function () {
+  clearInterval(intervalArgsHandler);
+
+  intervalArgsThis = this;
+}, 0, "args ...");
+
+var timeoutHandler = setTimeout(function () {
+  timeoutThis = this;
+});
+
+var timeoutArgsHandler = setTimeout(function () {
+  timeoutArgsThis = this;
+}, 0, "args ...");
+
+process.once('exit', function () {
+  assert.strictEqual(immediateThis, immediateHandler);
+  assert.strictEqual(immediateArgsThis, immediateArgsHandler);
+
+  assert.strictEqual(intervalThis, intervalHandler);
+  assert.strictEqual(intervalArgsThis, intervalArgsHandler);
+
+  assert.strictEqual(timeoutThis, timeoutHandler);
+  assert.strictEqual(timeoutArgsThis, timeoutArgsHandler);
+});