2 files changed, 54 insertions, 7 deletions

diff --git a/lib/net.js b/lib/net.js
index 646983f6ca..7f6f306b84 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -307,7 +307,7 @@ Socket.prototype.listen = function() {
 Socket.prototype.setTimeout = function(msecs, callback) {
   if (msecs > 0 && !isNaN(msecs) && isFinite(msecs)) {
     timers.enroll(this, msecs);
-    timers.active(this);
+    timers._unrefActive(this);
     if (callback) {
       this.once('timeout', callback);
     }
@@ -481,7 +481,7 @@ function onread(buffer, offset, length) {
   var self = handle.owner;
   assert(handle === self._handle, 'handle != self._handle');
 
-  timers.active(self);
+  timers._unrefActive(self);
 
   var end = offset + length;
   debug('onread', process._errno, offset, length, end);
@@ -612,7 +612,7 @@ Socket.prototype._write = function(data, encoding, cb) {
   this._pendingData = null;
   this._pendingEncoding = '';
 
-  timers.active(this);
+  timers._unrefActive(this);
 
   if (!this._handle) {
     this._destroy(new Error('This socket is closed.'), cb);
@@ -702,7 +702,7 @@ function afterWrite(status, handle, req) {
     return;
   }
 
-  timers.active(self);
+  timers._unrefActive(self);
 
   if (self !== process.stderr && self !== process.stdout)
     debug('afterWrite call cb');
@@ -783,7 +783,7 @@ Socket.prototype.connect = function(options, cb) {
     self.once('connect', cb);
   }
 
-  timers.active(this);
+  timers._unrefActive(this);
 
   self._connecting = true;
   self.writable = true;
@@ -814,7 +814,7 @@ Socket.prototype.connect = function(options, cb) {
           self._destroy();
         });
       } else {
-        timers.active(self);
+        timers._unrefActive(self);
 
         addressType = addressType || 4;
 
@@ -861,7 +861,7 @@ function afterConnect(status, handle, req, readable, writable) {
   if (status == 0) {
     self.readable = readable;
     self.writable = writable;
-    timers.active(self);
+    timers._unrefActive(self);
 
     self.emit('connect');
 
diff --git a/test/simple/test-net-socket-timeout-unref.js b/test/simple/test-net-socket-timeout-unref.js
new file mode 100644
index 0000000000..32aef444a9
--- /dev/null
+++ b/test/simple/test-net-socket-timeout-unref.js
@@ -0,0 +1,47 @@
+// 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 common = require('../common');
+var assert = require('assert');
+var net = require('net');
+
+var server = net.createServer(function (c) {
+  c.write('hello');
+  c.unref();
+});
+server.listen(common.PORT);
+server.unref();
+
+var timedout = false;
+
+[8, 5, 3, 6, 2, 4].forEach(function (T) {
+  var socket = net.createConnection(common.PORT, 'localhost');
+  socket.setTimeout(T * 1000, function () {
+    console.log(process._getActiveHandles());
+    timedout = true;
+    socket.destroy();
+  });
+  socket.unref();
+});
+
+process.on('exit', function () {
+  assert.strictEqual(timedout, false, 'Socket timeout should not hold loop open');
+});