fix http url chinese directory bug

Optimize Windows Not Found request performance

Author: House-Men

http/server/FileCache.cpp

@@ -8,7 +8,7 @@
 #include "httpdef.h"    // import http_content_type_str_by_suffix
 #include "http_page.h"  // import make_index_of_page
 
-#ifdef _MSC_VER
+#ifdef OS_WIN
 #include <codecvt>
 #endif
 
@@ -19,27 +19,27 @@ FileCache::FileCache() {
     expired_time  = 60; // s
 }
 
-static int hv_open(char const* filepath, int flags) {
-#ifdef _MSC_VER
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
-    auto wfilepath = conv.from_bytes(filepath);
-    int fd = _wopen(wfilepath.c_str(), flags);
-#else
-    int fd = open(filepath, flags);
-#endif
-    return fd;
-}
-
 file_cache_ptr FileCache::Open(const char* filepath, OpenParam* param) {
     std::lock_guard<std::mutex> locker(mutex_);
     file_cache_ptr fc = Get(filepath);
+#ifdef OS_WIN
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
+    std::wstring wfilepath;
+#endif
     bool modified = false;
     if (fc) {
         time_t now = time(NULL);
         if (now - fc->stat_time > stat_interval) {
-            modified = fc->is_modified();
             fc->stat_time = now;
             fc->stat_cnt++;
+#ifdef OS_WIN
+            wfilepath = conv.from_bytes(filepath);
+            now = fc->st.st_mtime;
+            _wstat(wfilepath.c_str(), (struct _stat*)&fc->st);
+            modified = now != fc->st.st_mtime;
+#else
+            modified = fc->is_modified();
+#endif
         }
         if (param->need_read) {
             if (!modified && fc->is_complete()) {
@@ -48,31 +48,35 @@ file_cache_ptr FileCache::Open(const char* filepath, OpenParam* param) {
         }
     }
     if (fc == NULL || modified || param->need_read) {
+        struct stat st;
         int flags = O_RDONLY;
 #ifdef O_BINARY
         flags |= O_BINARY;
 #endif
-        int fd = hv_open(filepath, flags);
-        if (fd < 0) {
+        int fd = -1;
 #ifdef OS_WIN
-            // NOTE: open(dir) return -1 on windows
-            if (!hv_isdir(filepath)) {
-                param->error = ERR_OPEN_FILE;
-                return NULL;
-            }
-#else
+        if(wfilepath.empty()) wfilepath = conv.from_bytes(filepath);
+        // NOTE: Optimize Windows Not Found request performance
+        if(_wstat(wfilepath.c_str(), (struct _stat*)&st) != 0) {
             param->error = ERR_OPEN_FILE;
             return NULL;
+        }
+        // NOTE: open(dir) return -1 on windows
+        if(S_ISREG(st.st_mode)) {
+            fd = _wopen(wfilepath.c_str(), flags);
+        }else if(S_ISDIR(st.st_mode)) {
+            fd = 0;
+        }
+#else
+       fd = open(filepath, flags);
 #endif
+        if (fd < 0) {
+            param->error = ERR_OPEN_FILE;
+            return NULL;
         }
         defer(if (fd > 0) { close(fd); })
         if (fc == NULL) {
-            struct stat st;
-            if (fd > 0) {
-                fstat(fd, &st);
-            } else {
-                stat(filepath, &st);
-            }
+            if (fd > 0) fstat(fd, &st);
             if (S_ISREG(st.st_mode) ||
                 (S_ISDIR(st.st_mode) &&
                  filepath[strlen(filepath)-1] == '/')) {