supporting serving an index.html for directories

source/vibe/http/fileserver.d

@@ -41,20 +41,18 @@ HTTPServerRequestDelegate serveStaticFiles(Path local_path, HTTPFileServerSettin
 			logDebug("path '%s' not starting with '%s'", srv_path, settings.serverPathPrefix);
 			return;
 		}
-		
+
 		auto rel_path = srv_path[settings.serverPathPrefix.length .. $];
 		auto rpath = Path(rel_path);
 		logTrace("Processing '%s'", srv_path);
 
 		rpath.normalize();
 		logDebug("Path '%s' -> '%s'", rel_path, rpath.toNativeString());
-		if (rpath.empty) {
-			// TODO: support searching for an index file
-			return;
-		} else if (rpath.absolute) {
+		if (rpath.absolute) {
 			logDebug("Path is absolute, not responding");
 			return;
-		} else if (rpath[0] == "..") return; // don't respond to relative paths outside of the root path
+		} else if (!rpath.empty && rpath[0] == "..")
+			return; // don't respond to relative paths outside of the root path
 
 		sendFile(req, res, local_path ~ rpath, settings);
 	}
@@ -139,8 +137,9 @@ class HTTPFileServerSettings {
 	string serverPathPrefix = "/";
 	Duration maxAge;// = hours(24);
 	bool failIfNotFound = false;
+	bool serveIndex = true;
 	string[string] encodingFileExtension;
-	
+
 	/**
 		Called just before headers and data are sent.
 		Allows headers to be customized, or other custom processing to be performed.
@@ -162,7 +161,7 @@ class HTTPFileServerSettings {
 		this();
 		serverPathPrefix = path_prefix;
 	}
-} 
+}
 
 
 private void sendFile(HTTPServerRequest req, HTTPServerResponse res, Path path, HTTPFileServerSettings settings)
@@ -182,6 +181,7 @@ private void sendFile(HTTPServerRequest req, HTTPServerResponse res, Path path,
 	}
 
 	if (dirent.isDirectory) {
+		if( settings.serveIndex ) return sendFile(req, res, path ~ "index.html", settings);
 		logDebugV("Hit directory when serving files, ignoring: %s", pathstr);
 		if( settings.failIfNotFound ) throw new HTTPStatusException(HTTPStatus.NotFound);
 		else return;
@@ -190,7 +190,7 @@ private void sendFile(HTTPServerRequest req, HTTPServerResponse res, Path path,
 	auto lastModified = toRFC822DateTimeString(dirent.timeModified.toUTC());
 	// simple etag generation
 	auto etag = "\"" ~ hexDigest!MD5(pathstr ~ ":" ~ lastModified ~ ":" ~ to!string(dirent.size)).idup ~ "\"";
-	
+
 	res.headers["Last-Modified"] = lastModified;
 	res.headers["Etag"] = etag;
 	if (settings.maxAge > seconds(0)) {
@@ -221,7 +221,7 @@ private void sendFile(HTTPServerRequest req, HTTPServerResponse res, Path path,
 		res.headers.remove("Content-Encoding");
 	res.headers["Content-Type"] = mimetype;
 	res.headers["Content-Length"] = to!string(dirent.size);
-	
+
 	// check for already encoded file if configured
 	string encodedFilepath;
 	auto pce = "Content-Encoding" in res.headers;
@@ -251,18 +251,18 @@ private void sendFile(HTTPServerRequest req, HTTPServerResponse res, Path path,
 			encodedFilepath = null;
 		}
 	}
-	
+
 	if(settings.preWriteCallback)
 		settings.preWriteCallback(req, res, pathstr);
-	
+
 	// for HEAD responses, stop here
 	if( res.isHeadResponse() ){
 		res.writeVoidBody();
 		assert(res.headerWritten);
 		logDebug("sent file header %d, %s!", dirent.size, res.headers["Content-Type"]);
 		return;
 	}
-	
+
 	// else write out the file contents
 	//logTrace("Open file '%s' -> '%s'", srv_path, pathstr);
 	FileStream fil;