Index: README
==================================================================
--- README
+++ README
@@ -80,11 +80,16 @@
         In these cases the executable may be compiled with the
         FILED_FAKE_CHROOT C preprocessor macro defined and instead of calling
         chroot() all HTTP requests will have the root suffix specified as the
         argument to the "-r" or "--root" option prepended to them.
 
-   6. MIME Types (MIMETYPES)
+   6. Differing "index.html" handling (CFLAGS, -DFILED_DONT_REDIRECT_DIRECTORIES=1)
+        Normally "filed" redirects users who request a directory to the
+        index.html file in that directory so that no memory allocations are
+        required;  This option lets the server generate the new path.
+
+   7. MIME Types (MIMETYPES)
 	For single-file convenience "filed" compiles the mapping of file
 	extensions (the string in the filename following its last dot ("."))
 	into the executable.  This mapping comes from a file in the format of
 		type1   type1_extension1 type1_extension2...
 		type2   type2_extension1 type2_extension2...

Index: filed.c
==================================================================
--- filed.c
+++ filed.c
@@ -1209,12 +1209,13 @@
 
 	return;
 }
 
 /* Return a redirect to index.html */
+#ifndef FILED_DONT_REDIRECT_DIRECTORIES
 static void filed_redirect_index(FILE *fp, const char *date_current, const char *path, struct filed_log_entry *log) {
-	int http_code = 301;
+	int http_code = 302;
 	fprintf(fp, "HTTP/1.1 %i OK\r\nDate: %s\r\nServer: filed\r\nLast-Modified: %s\r\nContent-Length: 0\r\nConnection: close\r\nLocation: %s\r\n\r\n",
 		http_code,
 		date_current,
 		date_current,
 		"index.html"
@@ -1234,10 +1235,11 @@
 	return;
 
 	/* Currently unused: path */
 	path = path;
 }
+#endif
 
 /* Convert an enum representing the "Connection" header value to a string */
 static const char *filed_connection_str(int connection_value) {
 	switch (connection_value) {
 		case FILED_CONNECTION_CLOSE:
@@ -1295,13 +1297,28 @@
 	strcpy(log->buffer, path);
 	log->method = request->method;
 
 	/* If the requested path is a directory, redirect to index page */
 	if (request->type == FILED_REQUEST_TYPE_DIRECTORY) {
+#ifdef FILED_DONT_REDIRECT_DIRECTORIES
+		char localpath[8192];
+		int snprintf_ret;
+
+		snprintf_ret = snprintf(localpath, sizeof(localpath), "%s/index.html", path);
+
+		if (snprintf_ret <= 0 || snprintf_ret > (sizeof(localpath) - 1)) {
+			filed_error_page(fp, date_current, 500, request->method, "path_format", log);
+
+			return(FILED_CONNECTION_CLOSE);
+		}
+
+		path = localpath;
+#else
 		filed_redirect_index(fp, date_current, path, log);
 
 		return(FILED_CONNECTION_CLOSE);
+#endif
 	}
 
 	fileinfo = filed_open_file(path, &request->fileinfo, options);
 	if (fileinfo == NULL) {
 		filed_error_page(fp, date_current, 404, request->method, "open_failed", log);