http,net,tls: return this from setTimeout methods

Modifies the setTimeout methods for the following prototypes:

- http.ClientRequest
- http.IncomingMessage
- http.OutgoingMessage
- http.Server
- https.Server
- net.Socket
- tls.TLSSocket

Previously, the above functions returned undefined. They now return
`this`. This is useful for chaining function calls.

PR-URL: https://github.com/nodejs/io.js/pull/1699
Reviewed-By: Roman Reiss <me@silverwind.io>

9 files changed, 29 insertions, 15 deletions

diff --git a/test/parallel/test-http-client-timeout.js b/test/parallel/test-http-client-timeout.js
index 8ea36de41..a9b093eb0 100644
--- a/test/parallel/test-http-client-timeout.js
+++ b/test/parallel/test-http-client-timeout.js
@@ -23,7 +23,8 @@ server.listen(options.port, options.host, function() {
   function destroy() {
     req.destroy();
   }
-  req.setTimeout(1, destroy);
+  var s = req.setTimeout(1, destroy);
+  assert.ok(s instanceof http.ClientRequest);
   req.on('error', destroy);
   req.end();
 });
diff --git a/test/parallel/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js
index ccad6f1f3..caefc0383 100644
--- a/test/parallel/test-http-set-timeout-server.js
+++ b/test/parallel/test-http-set-timeout-server.js
@@ -29,12 +29,13 @@ test(function serverTimeout(cb) {
     // just do nothing, we should get a timeout event.
   });
   server.listen(common.PORT);
-  server.setTimeout(50, function(socket) {
+  var s = server.setTimeout(50, function(socket) {
     caughtTimeout = true;
     socket.destroy();
     server.close();
     cb();
   });
+  assert.ok(s instanceof http.Server);
   http.get({ port: common.PORT }).on('error', function() {});
 });
 
@@ -45,12 +46,13 @@ test(function serverRequestTimeout(cb) {
   });
   var server = http.createServer(function(req, res) {
     // just do nothing, we should get a timeout event.
-    req.setTimeout(50, function() {
+    var s = req.setTimeout(50, function() {
       caughtTimeout = true;
       req.socket.destroy();
       server.close();
       cb();
     });
+    assert.ok(s instanceof http.IncomingMessage);
   });
   server.listen(common.PORT);
   var req = http.request({ port: common.PORT, method: 'POST' });
@@ -66,12 +68,13 @@ test(function serverResponseTimeout(cb) {
   });
   var server = http.createServer(function(req, res) {
     // just do nothing, we should get a timeout event.
-    res.setTimeout(50, function() {
+    var s = res.setTimeout(50, function() {
       caughtTimeout = true;
       res.socket.destroy();
       server.close();
       cb();
     });
+    assert.ok(s instanceof http.OutgoingMessage);
   });
   server.listen(common.PORT);
   http.get({ port: common.PORT }).on('error', function() {});
@@ -86,9 +89,10 @@ test(function serverRequestNotTimeoutAfterEnd(cb) {
   });
   var server = http.createServer(function(req, res) {
     // just do nothing, we should get a timeout event.
-    req.setTimeout(50, function(socket) {
+    var s = req.setTimeout(50, function(socket) {
       caughtTimeoutOnRequest = true;
     });
+    assert.ok(s instanceof http.IncomingMessage);
     res.on('timeout', function(socket) {
       caughtTimeoutOnResponse = true;
     });
@@ -108,9 +112,10 @@ test(function serverResponseTimeoutWithPipeline(cb) {
     assert.equal(caughtTimeout, '/2');
   });
   var server = http.createServer(function(req, res) {
-    res.setTimeout(50, function() {
+    var s = res.setTimeout(50, function() {
       caughtTimeout += req.url;
     });
+    assert.ok(s instanceof http.OutgoingMessage);
     if (req.url === '/1') res.end();
   });
   server.on('timeout', function(socket) {
@@ -144,12 +149,13 @@ test(function idleTimeout(cb) {
     });
     res.end();
   });
-  server.setTimeout(50, function(socket) {
+  var s = server.setTimeout(50, function(socket) {
     caughtTimeoutOnServer = true;
     socket.destroy();
     server.close();
     cb();
   });
+  assert.ok(s instanceof http.Server);
   server.listen(common.PORT);
   var c = net.connect({ port: common.PORT, allowHalfOpen: true }, function() {
     c.write('GET /1 HTTP/1.1\r\nHost: localhost\r\n\r\n');
diff --git a/test/parallel/test-http-set-timeout.js b/test/parallel/test-http-set-timeout.js
index 1c547f06e..5bb34ad4f 100644
--- a/test/parallel/test-http-set-timeout.js
+++ b/test/parallel/test-http-set-timeout.js
@@ -1,11 +1,12 @@
 var common = require('../common');
 var assert = require('assert');
 var http = require('http');
+var net = require('net');
 
 var server = http.createServer(function(req, res) {
   console.log('got request. setting 1 second timeout');
-  req.connection.setTimeout(500);
-
+  var s = req.connection.setTimeout(500);
+  assert.ok(s instanceof net.Socket);
   req.connection.on('timeout', function() {
     req.connection.destroy();
     common.debug('TIMEOUT');
diff --git a/test/parallel/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js
index 5ae8baee6..a78725eef 100644
--- a/test/parallel/test-https-set-timeout-server.js
+++ b/test/parallel/test-https-set-timeout-server.js
@@ -41,12 +41,13 @@ test(function serverTimeout(cb) {
     // just do nothing, we should get a timeout event.
   });
   server.listen(common.PORT);
-  server.setTimeout(50, function(socket) {
+  var s = server.setTimeout(50, function(socket) {
     caughtTimeout = true;
     socket.destroy();
     server.close();
     cb();
   });
+  assert.ok(s instanceof https.Server);
   https.get({
     port: common.PORT,
     rejectUnauthorized: false
diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
index d802ad4ae..0a074da07 100644
--- a/test/parallel/test-https-timeout-server-2.js
+++ b/test/parallel/test-https-timeout-server-2.js
@@ -20,10 +20,11 @@ var options = {
 var server = https.createServer(options, assert.fail);
 
 server.on('secureConnection', function(cleartext) {
-  cleartext.setTimeout(50, function() {
+  var s = cleartext.setTimeout(50, function() {
     cleartext.destroy();
     server.close();
   });
+  assert.ok(s instanceof tls.TLSSocket);
 });
 
 server.listen(common.PORT, function() {
diff --git a/test/parallel/test-net-settimeout.js b/test/parallel/test-net-settimeout.js
index 28943a1ef..a11c4a12e 100644
--- a/test/parallel/test-net-settimeout.js
+++ b/test/parallel/test-net-settimeout.js
@@ -18,12 +18,13 @@ var left = killers.length;
 killers.forEach(function(killer) {
   var socket = net.createConnection(common.PORT, 'localhost');
 
-  socket.setTimeout(T, function() {
+  var s = socket.setTimeout(T, function() {
     socket.destroy();
     if (--left === 0) server.close();
     assert.ok(killer !== 0);
     clearTimeout(timeout);
   });
+  assert.ok(s instanceof net.Socket);
 
   socket.setTimeout(killer);
 
diff --git a/test/parallel/test-tls-request-timeout.js b/test/parallel/test-tls-request-timeout.js
index 10a14696c..a5dcdd37e 100644
--- a/test/parallel/test-tls-request-timeout.js
+++ b/test/parallel/test-tls-request-timeout.js
@@ -17,7 +17,8 @@ var options = {
 };
 
 var server = tls.Server(options, function(socket) {
-  socket.setTimeout(100);
+  var s = socket.setTimeout(100);
+  assert.ok(s instanceof tls.TLSSocket);
 
   socket.on('timeout', function(err) {
     hadTimeout = true;
diff --git a/test/parallel/test-tls-timeout-server-2.js b/test/parallel/test-tls-timeout-server-2.js
index a16ce3316..dc3d52da0 100644
--- a/test/parallel/test-tls-timeout-server-2.js
+++ b/test/parallel/test-tls-timeout-server-2.js
@@ -15,10 +15,11 @@ var options = {
 };
 
 var server = tls.createServer(options, function(cleartext) {
-  cleartext.setTimeout(50, function() {
+  var s = cleartext.setTimeout(50, function() {
     cleartext.destroy();
     server.close();
   });
+  assert.ok(s instanceof tls.TLSSocket);
 });
 
 server.listen(common.PORT, function() {
diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js
index 3013f6888..75952da6a 100644
--- a/test/parallel/test-tls-wrap-timeout.js
+++ b/test/parallel/test-tls-wrap-timeout.js
@@ -27,9 +27,10 @@ var server = tls.createServer(options, function(c) {
 
 server.listen(common.PORT, function() {
   var socket = net.connect(common.PORT, function() {
-    socket.setTimeout(common.platformTimeout(240), function() {
+    var s = socket.setTimeout(common.platformTimeout(240), function() {
       throw new Error('timeout');
     });
+    assert.ok(s instanceof net.Socket);
 
     var tsocket = tls.connect({
       socket: socket,