Merge pull request #15 from indexzero/timeout

[fix] add ability to configure timeout

Author: Martijn Swaagman

index.js

@@ -100,9 +100,12 @@ module.exports = function createServers(options, listening) {
     }
 
     var server = http.createServer(options.http.handler || handler),
+        timeout = options.timeout || options.http.timeout,
         port   = !isNaN(options.http.port) ? +options.http.port : 80, // accepts string or number
         args;
 
+    if (typeof timeout === 'number') server.setTimeout(timeout);
+
     args = [server, port];
     if (options.http.host) {
       args.push(options.http.host);
@@ -126,6 +129,7 @@ module.exports = function createServers(options, listening) {
     var ssl  = options.https,
         port = !isNaN(ssl.port) ? +ssl.port : 443,  // accepts string or number
         ciphers = ssl.ciphers || CIPHERS,
+        timeout = options.timeout || ssl.timeout,
         ca = ssl.ca,
         server,
         args;
@@ -165,6 +169,7 @@ module.exports = function createServers(options, listening) {
     log('https | listening on %d', port);
     server = https.createServer(finalHttpsOptions, ssl.handler || handler);
 
+    if (typeof timeout === 'number') server.setTimeout(timeout);
     args = [server, port];
     if (options.https.host) {
       args.push(options.https.host);

test/create-servers-test.js

@@ -51,6 +51,24 @@ test('only http, port 0', function (t) {
   });
 });
 
+test('only http, timeout', function (t) {
+  t.plan(5);
+  var time = 3000000;
+  createServers({
+    log: console.log,
+    timeout: time,
+    http: 0,
+    handler: fend
+  }, function (err, servers) {
+    console.dir(err);
+    t.error(err);
+    t.equals(typeof servers, 'object');
+    t.equals(typeof servers.http, 'object');
+    t.equals(typeof servers.http.address().port, 'number');
+    t.equals(servers.http.timeout, time);
+    servers.http.close();
+  });
+});
 
 test('only https', function (t) {
   t.plan(3);
@@ -71,6 +89,28 @@ test('only https', function (t) {
   });
 });
 
+test('only https', function (t) {
+  t.plan(4);
+  var time = 4000000;
+  createServers({
+    log: console.log,
+    https: {
+      timeout: time,
+      port: 3456,
+      root: path.join(__dirname, 'fixtures'),
+      cert: 'agent2-cert.pem',
+      key:  'agent2-key.pem'
+    },
+    handler: fend
+  }, function (err, servers) {
+    t.error(err);
+    t.equals(typeof servers, 'object');
+    t.equals(typeof servers.https, 'object');
+    t.equals(servers.https.timeout, time);
+    servers.https.close();
+  });
+});
+
 test('absolute cert path resolution', function (t) {
   t.plan(3);
   createServers({