From fb4fae917427b685b6148f5b425b4f0d59b7a256 Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Sat, 24 Jul 2021 21:23:52 +0100
Subject: [PATCH] Optimise file serving path

---
 mongoose.c | 10 +++++-----
 src/http.c | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mongoose.c b/mongoose.c
index f810f418..a9b2a825 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -1275,17 +1275,18 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
       mg_http_reply(c, 404, "", "Invalid URI [%.*s]\n", (int) hm->uri.len,
                     hm->uri.ptr);
     } else {
-      FILE *fp = fopen(t2, "r");
+      struct stat st;
+      int res = stat(t2, &st);
 #if MG_ENABLE_SSI
-      if (is_index && fp == NULL) {
+      if (is_index && res != 0) {
         char *p = t2 + strlen(t2);
         while (p > t2 && p[-1] != '/') p--;
         strncpy(p, "index.shtml", (size_t)(&t2[sizeof(t2)] - p - 2));
         t2[sizeof(t2) - 1] = '\0';
-        fp = fopen(t2, "r");
+        res = stat(t2, &st);
       }
 #endif
-      if (is_index && fp == NULL) {
+      if (is_index && res != 0) {
 #if MG_ENABLE_DIRECTORY_LISTING
         listdir(c, hm, opts, t2);
 #else
@@ -1302,7 +1303,6 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
         mg_http_serve_file(c, hm, t2, guess_content_type(t2),
                            opts->extra_headers);
       }
-      if (fp != NULL) fclose(fp);
     }
   }
 }
diff --git a/src/http.c b/src/http.c
index 4c96927c..295efb2a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -856,17 +856,18 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
       mg_http_reply(c, 404, "", "Invalid URI [%.*s]\n", (int) hm->uri.len,
                     hm->uri.ptr);
     } else {
-      FILE *fp = fopen(t2, "r");
+      struct stat st;
+      int res = stat(t2, &st);
 #if MG_ENABLE_SSI
-      if (is_index && fp == NULL) {
+      if (is_index && res != 0) {
         char *p = t2 + strlen(t2);
         while (p > t2 && p[-1] != '/') p--;
         strncpy(p, "index.shtml", (size_t)(&t2[sizeof(t2)] - p - 2));
         t2[sizeof(t2) - 1] = '\0';
-        fp = fopen(t2, "r");
+        res = stat(t2, &st);
       }
 #endif
-      if (is_index && fp == NULL) {
+      if (is_index && res != 0) {
 #if MG_ENABLE_DIRECTORY_LISTING
         listdir(c, hm, opts, t2);
 #else
@@ -883,7 +884,6 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm,
         mg_http_serve_file(c, hm, t2, guess_content_type(t2),
                            opts->extra_headers);
       }
-      if (fp != NULL) fclose(fp);
     }
   }
 }