Fix serach order for index.htm(l)(.gz) files

earlephilhower · earlephilhower · commit 96e3d5ff4a16 · 2020-02-09T09:37:17.000-08:00
Fixes esp8266#6984 When a directory index is requested with an explicit index.html, follow the original webserver order and check for: index.htm, index.htm.gz, index.html, index.html.gz, in order. Fixes the regressions introduced in 9f2cfb8 and 6768116
diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -110,7 +110,9 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
             // Append whatever follows this URI in request to get the file path.
             path += requestUri.substring(_baseUriLength);
 
-            if (!_fs.exists(path) && path.endsWith(".htm") && _fs.exists(path + "l")) {
+            // If neither <blah> nor <blah>.gz exist, and <blah> is a file.htm, try it with file.html instead
+            // For the normal case this will give a search order of index.htm, index.htm.gz, index.html, index.html.gz
+            if (!_fs.exists(path) && !_fs.exists(path + ".gz") && path.endsWith(".htm")) {
                 path += "l";
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,9 @@ class StaticRequestHandler : public RequestHandler<ServerType> {`
`110`	`110`	`// Append whatever follows this URI in request to get the file path.`
`111`	`111`	`path += requestUri.substring(_baseUriLength);`
`112`	`112`
`113`		`- if (!_fs.exists(path) && path.endsWith(".htm") && _fs.exists(path + "l")) {`
	`113`	`+ // If neither <blah> nor <blah>.gz exist, and <blah> is a file.htm, try it with file.html instead`
	`114`	`+ // For the normal case this will give a search order of index.htm, index.htm.gz, index.html, index.html.gz`
	`115`	`+ if (!_fs.exists(path) && !_fs.exists(path + ".gz") && path.endsWith(".htm")) {`
`114`	`116`	`path += "l";`
`115`	`117`	`}`
`116`	`118`	`}`