timers: remember extra setTimeout() arguments when timeout==0

Fixes #2079.

1 files changed, 11 insertions, 16 deletions

diff --git a/lib/timers.js b/lib/timers.js
index 59b016ef3b..39eb4d9161 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -144,19 +144,23 @@ exports.active = function(item) {
 
 
 exports.setTimeout = function(callback, after) {
-  var timer, c, args;
+  var timer;
 
   if (after <= 0) {
     // Use the slow case for after == 0
     timer = new Timer();
-    timer.ontimeout = callback;
 
-    args = Array.prototype.slice.call(arguments, 2);
-    timer._onTimeout = function() {
-      callback.apply(timer, args);
-      timer.close();
+    if (arguments.length <= 2) {
+      timer._onTimeout = callback;
+    } else {
+      var args = Array.prototype.slice.call(arguments, 2);
+      timer._onTimeout = function() {
+        callback.apply(timer, args);
+        timer.close();
+      }
     }
 
+    timer.ontimeout = timer._onTimeout;
     timer.start(0, 0);
   } else {
     timer = { _idleTimeout: after };
@@ -166,16 +170,7 @@ exports.setTimeout = function(callback, after) {
     if (arguments.length <= 2) {
       timer._onTimeout = callback;
     } else {
-      /*
-       * Sometimes setTimeout is called with arguments, EG
-       *
-       *   setTimeout(callback, 2000, "hello", "world")
-       *
-       * If that's the case we need to call the callback with
-       * those args. The overhead of an extra closure is not
-       * desired in the normal case.
-       */
-      args = Array.prototype.slice.call(arguments, 2);
+      var args = Array.prototype.slice.call(arguments, 2);
       timer._onTimeout = function() {
         callback.apply(timer, args);
       }