Merge branch 'master' into update-travis-node-versions

Author: thornjad

README.md

@@ -82,6 +82,16 @@ Using `npx` you can run the script without installing it first:
 - `index.html` will be served as the default file to any directory requests.
 - `404.html` will be served if a file is not found. This can be used for Single-Page App (SPA) hosting to serve the entry page.
 
+## Catch-all redirect
+
+To implement a catch-all redirect, use the index page itself as the proxy with:
+
+```
+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!
+
 # Development
 
 Checkout this repository locally, then:

package-lock.json

@@ -84,7 +84,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);