Fixing ClientRequest setTimeout EventEmitter Leak

This will fix #3068

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/http.js b/lib/http.js
index d54abc9d5e..a3f7118b8e 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -1471,6 +1471,11 @@ ClientRequest.prototype.setSocketKeepAlive = function() {
   this._deferToConnect('setKeepAlive', arguments);
 };
 
+ClientRequest.prototype.clearTimeout = function() {
+  var args = Array.prototype.slice.call(arguments, 0);
+  args.unshift(0);
+  this._deferToConnect('setTimeout', args);
+};
 
 exports.request = function(options, cb) {
   if (options.protocol && options.protocol !== 'http:') {
diff --git a/lib/net.js b/lib/net.js
index df29bd2908..6c2e86e832 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -173,6 +173,9 @@ Socket.prototype.setTimeout = function(msecs, callback) {
     }
   } else if (msecs === 0) {
     timers.unenroll(this);
+    if (callback) {
+      this.removeListener('timeout', callback);
+    }
   }
 };