From 2f471f2b32d8c87ff760393e8fb6e9f18c342eb9 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 19 Feb 2015 14:14:36 +0100
Subject: [PATCH] net: unref timer in parent sockets

`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from
`TLSSocket` do not touch the timers of original `net.Socket`.

Introduce `socket._parent` property, and iterate through all parents
to unref timers and prevent timeout event on original `net.Socket`.

Fix: https://github.com/joyent/node/issues/9242
---
 lib/_tls_wrap.js                       |  2 ++
 lib/net.js                             | 22 +++++++++++------
 test/parallel/test-tls-wrap-timeout.js | 34 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 test/parallel/test-tls-wrap-timeout.js

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index c24d366f97ea02..b34978caa8240c 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -213,6 +213,8 @@ function TLSSocket(socket, options) {
     readable: false,
     writable: false
   });
+  if (socket)
+    this._parent = socket;
 
   // To prevent assertion in afterConnect()
   if (socket)
diff --git a/lib/net.js b/lib/net.js
index 9f566b684d46ce..1d1e3318934882 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -120,6 +120,7 @@ function Socket(options) {
   this._connecting = false;
   this._hadError = false;
   this._handle = null;
+  this._parent = null;
   this._host = null;
 
   if (typeof options === 'number')
@@ -445,7 +446,8 @@ Socket.prototype._destroy = function(exception, cb) {
 
   this.readable = this.writable = false;
 
-  timers.unenroll(this);
+  for (var s = this; s !== null; s = s._parent)
+    timers.unenroll(s);
 
   debug('close');
   if (this._handle) {
@@ -490,7 +492,8 @@ function onread(nread, buffer) {
   var self = handle.owner;
   assert(handle === self._handle, 'handle != self._handle');
 
-  timers._unrefActive(self);
+  for (var s = self; s !== null; s = s._parent)
+    timers._unrefActive(s);
 
   debug('onread', nread);
 
@@ -621,7 +624,8 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
   this._pendingData = null;
   this._pendingEncoding = '';
 
-  timers._unrefActive(this);
+  for (var s = this; s !== null; s = s._parent)
+    timers._unrefActive(s);
 
   if (!this._handle) {
     this._destroy(new Error('This socket is closed.'), cb);
@@ -749,7 +753,8 @@ function afterWrite(status, handle, req, err) {
     return;
   }
 
-  timers._unrefActive(self);
+  for (var s = self; s !== null; s = s._parent)
+    timers._unrefActive(s);
 
   if (self !== process.stderr && self !== process.stdout)
     debug('afterWrite call cb');
@@ -864,7 +869,8 @@ Socket.prototype.connect = function(options, cb) {
     self.once('connect', cb);
   }
 
-  timers._unrefActive(this);
+  for (var s = this; s !== null; s = s._parent)
+    timers._unrefActive(s);
 
   self._connecting = true;
   self.writable = true;
@@ -919,7 +925,8 @@ Socket.prototype.connect = function(options, cb) {
           self._destroy();
         });
       } else {
-        timers._unrefActive(self);
+        for (var s = self; s !== null; s = s._parent)
+          timers._unrefActive(s);
         connect(self,
                 ip,
                 port,
@@ -964,7 +971,8 @@ function afterConnect(status, handle, req, readable, writable) {
   if (status == 0) {
     self.readable = readable;
     self.writable = writable;
-    timers._unrefActive(self);
+    for (var s = self; s !== null; s = s._parent)
+      timers._unrefActive(s);
 
     self.emit('connect');
 
diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js
new file mode 100644
index 00000000000000..a2fd20b779f30e
--- /dev/null
+++ b/test/parallel/test-tls-wrap-timeout.js
@@ -0,0 +1,34 @@
+if (!process.versions.openssl) process.exit();
+
+var common = require('../common');
+var assert = require('assert');
+var net = require('net');
+var tls = require('tls');
+var fs = require('fs');
+
+var options = {
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+};
+
+var server = tls.createServer(options, function(c) {
+  setTimeout(function() {
+    c.write('hello');
+    setTimeout(function() {
+      c.destroy();
+      server.close();
+    }, 75);
+  }, 75);
+});
+
+server.listen(common.PORT, function() {
+  var socket = net.connect(common.PORT, function() {
+    socket.setTimeout(120, assert.fail);
+
+    var tsocket = tls.connect({
+      socket: socket,
+      rejectUnauthorized: false
+    });
+    tsocket.resume();
+  });
+});