aboutsummaryrefslogtreecommitdiff
path: root/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
diff options
context:
space:
mode:
authorPhilipp Wiesemann <philipp.wiesemann@arcor.de>2015-05-16 21:33:40 +0200
committerElonen <elonen@iki.fi>2015-05-16 23:21:42 +0300
commitdd0a8cd787be7a33774c9f659562d2f5c6254931 (patch)
treedf5f9dbd90bef1a7f3f28540bcf904a9dfd5680a /webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
parente37bd6d1bda88760db5697355ed22270dabfb8c4 (diff)
downloadnanohttpd-dd0a8cd787be7a33774c9f659562d2f5c6254931.tar.gz
Fix webserver serving folder named like index file
If there was a directory named like an index file (e.g. "index.html"), other index files registered later (e.g. "index.htm") were ignored and the directory was served instead (or an index file in the directory). This was fixed by now checking if the index file is not a directory.
Diffstat (limited to 'webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java')
-rw-r--r--webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
index 7f5449c..a2396e8 100644
--- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -279,7 +279,7 @@ public class SimpleWebServer extends NanoHTTPD {
private String findIndexFileInDirectory(File directory) {
for (String fileName : SimpleWebServer.INDEX_FILE_NAMES) {
File indexFile = new File(directory, fileName);
- if (indexFile.exists()) {
+ if (indexFile.isFile()) {
return fileName;
}
}