Merge branch 'master' into hacky-fix

Author: Xmader

.travis.yml

@@ -1,10 +1,11 @@
 sudo: false
 language: node_js
 node_js:
-  - "4"
-  - "5"
   - "6"
-  - "7"
+  - "8"
+  - "10"
+  - "12"
+  - "13"
 
 before_install:
   - travis_retry npm install

README.md

@@ -75,6 +75,8 @@ Using `npx` you can run the script without installing it first:
 
 `-r` or `--robots` Provide a /robots.txt (whose content defaults to `User-agent: *\nDisallow: /`)
 
+`--no-dotfiles` Do not show dotfiles
+
 `-h` or `--help` Print this list and exit.
 
 ## Magic Files
@@ -92,6 +94,14 @@ http-server --proxy http://localhost:8080?
 
 Note the `?` at the end of the proxy URL. Thanks to [@houston3](https://github.com/houston3) for this clever hack!
 
+## Need a self signed SSL Certificate?
+
+Create the `cert.pem` and `key.pem` via the command:
+
+```
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem
+```
+
 # Development
 
 Checkout this repository locally, then:

bin/http-server

@@ -14,6 +14,8 @@ var colors     = require('colors/safe'),
 
 var ifaces = os.networkInterfaces();
 
+process.title = 'http-server';
+
 if (argv.h || argv.help) {
   console.log([
     'usage: http-server [path] [options]',
@@ -34,6 +36,8 @@ if (argv.h || argv.help) {
     '               Optionally provide a URL path to open the browser window to.',
     '  -c           Cache time (max-age) in seconds [3600], e.g. -c10 for 10 seconds.',
     '               To disable caching, use -c-1.',
+    '  -t           Connections timeout in seconds [120], e.g. -t60 for 1 minute.',
+    '               To disable timeout, use -t0',
     '  -U --utc     Use UTC time format in log messages.',
     '  --log-ip     Enable logging of the client\'s IP address',
     '',
@@ -109,6 +113,7 @@ function listen(port) {
   var options = {
     root: argv._[0],
     cache: argv.c,
+    timeout: argv.t,
     showDir: argv.d,
     autoIndex: argv.i,
     gzip: argv.g || argv.gzip,

lib/http-server.js

@@ -195,6 +195,9 @@ function HttpServer(options) {
   }
 
   this.server = union.createServer(serverOptions);
+  if (options.timeout !== undefined) {
+    this.server.setTimeout(options.timeout);
+  }
 }
 
 HttpServer.prototype.listen = function () {

package-lock.json

@@ -9,7 +9,9 @@
   },
   "keywords": [
     "cli",
-    "command"
+    "command",
+    "http",
+    "server"
   ],
   "scripts": {
     "start": "node ./bin/http-server",
@@ -20,6 +22,9 @@
     "lib",
     "bin"
   ],
+  "engines": {
+    "node": ">=6"
+  },
   "contributors": [
     {
       "name": "Charlie Robbins",
@@ -84,7 +89,7 @@
   "devDependencies": {
     "common-style": "^3.0.0",
     "request": "^2.88.0",
-    "vows": "~0.7.0"
+    "vows": "~0.8.3"
   },
   "bugs": {
     "url": "https://github.com/nodeapps/http-server/issues"

package.json

@@ -125,7 +125,13 @@ vows.describe('http-server').addBatch({
             assert.equal(body.trim(), file.trim());
           }
         }
+      },
+      teardown: function (proxyServer) {
+        proxyServer.close();
       }
+    },
+    teardown: function (server) {
+      server.close();
     }
   },
   'When cors is enabled': {
@@ -156,6 +162,9 @@ vows.describe('http-server').addBatch({
       'response Access-Control-Allow-Headers should contain X-Test': function (err, res) {
         assert.ok(res.headers['access-control-allow-headers'].split(/\s*,\s*/g).indexOf('X-Test') >= 0, 204);
       }
+    },
+    teardown: function (server) {
+      server.close();
     }
   },
   'When gzip and brotli compression is enabled and a compressed file is available': {
@@ -209,6 +218,9 @@ vows.describe('http-server').addBatch({
         assert.equal(res.statusCode, 200);
         assert.equal(res.headers['content-encoding'], 'br');
       }
+    },
+    teardown: function (server) {
+      server.close();
     }
   },
   'When http-server is listening on 8083 with username "good_username" and password "good_password"': {
@@ -341,6 +353,9 @@ vows.describe('http-server').addBatch({
           assert.equal(body.trim(), file.trim());
         }
       }
+    },
+    teardown: function (server) {
+      server.close();
     }
   }
 }).export(module);