Fix historyApiFallback, again.

The problem earlier with the fix in #627 was that it broke serving files
without extensions (or with `disableDotRule`).

This passed the test because the `disableDotRule: true` was removed; without
this the test will always succeed because without this rule, a request like `/other.html`
will always go directly to the file.

Author: SpaceK33z

lib/Server.js

@@ -227,14 +227,11 @@ function Server(compiler, options) {
 			}
 		},
 
-		contentBase: function() {
+		contentBaseFiles: function() {
 			if(Array.isArray(contentBase)) {
 				contentBase.forEach(function(item) {
 					app.get("*", express.static(item));
 				});
-				contentBase.forEach(function(item) {
-					app.get("*", serveIndex(item));
-				});
 			} else if(/^(https?:)?\/\//.test(contentBase)) {
 				// Redirect every request to contentBase
 				app.get("*", function(req, res) {
@@ -253,7 +250,17 @@ function Server(compiler, options) {
 				});
 			} else {
 				// route content request
-				app.get("*", express.static(contentBase, options.staticOptions), serveIndex(contentBase));
+				app.get("*", express.static(contentBase, options.staticOptions));
+			}
+		},
+
+		contentBaseIndex: function() {
+			if(Array.isArray(contentBase)) {
+				contentBase.forEach(function(item) {
+					app.get("*", serveIndex(item));
+				});
+			} else if(!/^(https?:)?\/\//.test(contentBase) && typeof contentBase !== "number") {
+				app.get("*", serveIndex(contentBase));
 			}
 		},
 
@@ -279,11 +286,13 @@ function Server(compiler, options) {
 	var defaultFeatures = ["setup", "headers", "middleware"];
 	if(options.proxy)
 		defaultFeatures.push("proxy", "middleware");
+	if(options.contentBase !== false)
+		defaultFeatures.push("contentBaseFiles");
 	if(options.historyApiFallback)
 		defaultFeatures.push("historyApiFallback", "middleware");
 	defaultFeatures.push("magicHtml");
 	if(options.contentBase !== false)
-		defaultFeatures.push("contentBase");
+		defaultFeatures.push("contentBaseIndex");
 	// compress is placed last and uses unshift so that it will be the first middleware used
 	if(options.compress)
 		defaultFeatures.unshift("compress");

test/HistoryApiFallback.test.js

@@ -53,7 +53,7 @@ describe("HistoryApiFallback", function() {
 			req = request(server.app);
 		});
 
-		it("historyApiFallback should take preference above magicHtml", function(done) {
+		it("historyApiFallback should take preference above directory index", function(done) {
 			req.get("/")
 			.accept("html")
 			.expect(200, /Foobar/, done);
@@ -66,9 +66,9 @@ describe("HistoryApiFallback", function() {
 		});
 
 		it("contentBase file should take preference above historyApiFallback", function(done) {
-			req.get("/other.html")
+			req.get("/random-file")
 			.accept("html")
-			.expect(200, /Other file/, done);
+			.expect(200, /Random file/, done);
 		});
 	});
 

test/fixtures/historyapifallback-2-config/random-file

@@ -0,0 +1 @@
+Random file