timer: fix leak of domain members in setTimeout()

Author: Shigeki Ohtsu

lib/timers.js

@@ -176,8 +176,20 @@ exports.setTimeout = function(callback, after) {
   timer._idlePrev = timer;
   timer._idleNext = timer;
 
+  function removeDomain() {
+    var domain = require('domain');
+    if (domain.active) {
+      domain.active.remove(timer);
+    }
+  }
+
   if (arguments.length <= 2) {
-    timer._onTimeout = callback;
+    timer._onTimeout = function() {
+      callback();
+      if (exports.usingDomains) {
+        removeDomain();
+      }
+    };
   } else {
     /*
      * Sometimes setTimeout is called with arguments, EG
@@ -191,7 +203,10 @@ exports.setTimeout = function(callback, after) {
     var args = Array.prototype.slice.call(arguments, 2);
     timer._onTimeout = function() {
       callback.apply(timer, args);
-    }
+      if (exports.usingDomains) {
+        rmoveDomain();
+      }
+    };
   }
 
   if (exports.usingDomains) {

test/simple/test-domain-timer-httpserver-leak.js

@@ -0,0 +1,51 @@
+// 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.js');
+var http = require('http');
+var domain = require('domain');
+var d = domain.create();
+var ncounter = 0;
+
+d.on('error', function(err) {
+  assert.strictEqual(err.domain.members.length, 1);
+  ncounter++;
+  if (ncounter === 2) {
+    server.close();
+  }
+});
+
+var server = http.createServer(d.bind(function(req, res) {
+  res.writeHead(200, {'Content-Type': 'text/plain'});
+  res.end('Hello');
+  throw new Error('error');
+})).listen(common.PORT, function() {
+  var options = {
+    host: '127.0.0.1',
+    port: common.PORT,
+    path: '/'
+  };
+  http.get(options);
+  setTimeout(function() {
+    http.get(options);
+  }, 1100);
+});