nginx: rebase patch

would not be compatible with versions before 1.15.8

Author: myfreeer

nginx-0002-win32-force-utf-8-encoding-in-ngx_dir_t.patch

@@ -1,59 +1,63 @@
-From f20ec74dfef1ad0e2792a33bef9173679398c3c8 Mon Sep 17 00:00:00 2001
+From 3e6a8cbee0f585286940120a0e3feec9fe3bad7a Mon Sep 17 00:00:00 2001
 From: myfreeer <myfreeer@users.noreply.github.com>
-Date: Fri, 20 Jul 2018 14:10:25 +0800
+Date: Sun, 30 Dec 2018 20:40:21 +0800
 Subject: [PATCH] win32: force utf-8 encoding in ngx_dir_t
 
 ---
- src/os/win32/ngx_files.c | 29 +++++++++++++++++++++++++++--
+ src/os/win32/ngx_files.c | 27 ++++++++++++++++++++++-----
  src/os/win32/ngx_files.h |  8 +++++---
- 2 files changed, 32 insertions(+), 5 deletions(-)
+ 2 files changed, 27 insertions(+), 8 deletions(-)
 
 diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
-index 55d7f76..bb3960a 100644
+index 0b131b5..f2d07e1 100644
 --- a/src/os/win32/ngx_files.c
 +++ b/src/os/win32/ngx_files.c
-@@ -427,19 +427,39 @@ ngx_realpath(u_char *path, u_char *resolved)
- ngx_int_t
- ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+@@ -429,6 +429,9 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
  {
+     u_char     *pattern, *p;
+     ngx_err_t   err;
 +    size_t      len;
 +    u_short    *u;
 +    u_short     utf16[NGX_UTF16_BUFLEN];
-     ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1);
 
--    dir->dir = FindFirstFile((const char *) name->data, &dir->finddata);
+     pattern = malloc(name->len + 3);
+     if (pattern == NULL) {
+@@ -436,21 +439,30 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+     }
+ 
+     p = ngx_cpymem(pattern, name->data, name->len);
+-
+     *p++ = '/';
+     *p++ = '*';
+     *p = '\0';
+ 
+-    dir->dir = FindFirstFile((const char *) pattern, &dir->finddata);
 +    len = NGX_UTF16_BUFLEN;
-+    u = ngx_utf8_to_utf16(utf16, name->data, &len);
-+
++    u = ngx_utf8_to_utf16(utf16, pattern, &len);
++    ngx_free(pattern);
 +    if (u == NULL) {
 +        return NGX_ERROR;
 +    }
-+
-+    dir->dir = FindFirstFileW((LPCWSTR) u, &dir->finddata);
- 
-     name->data[name->len] = '\0';
 
++    dir->dir = FindFirstFileW((LPCWSTR) u, &dir->finddata);
++    if (u != utf16) {
++        ngx_free(u);
++    }
      if (dir->dir == INVALID_HANDLE_VALUE) {
-+        if (u != utf16) {
-+            ngx_free(u);
-+        }
+         err = ngx_errno;
+-        ngx_free(pattern);
+         ngx_set_errno(err);
          return NGX_ERROR;
      }
 
+-    ngx_free(pattern);
 +    dir->utf8_length = WideCharToMultiByte(CP_UTF8, 0, dir->finddata.cFileName, -1, NULL, 0, NULL, NULL);
 +    dir->utf8 = calloc(dir->utf8_length, sizeof(char));
 +    WideCharToMultiByte(CP_UTF8, 0, dir->finddata.cFileName, -1, dir->utf8, dir->utf8_length, NULL, NULL);
-+
+ 
      dir->valid_info = 1;
      dir->ready = 1;
- 
-+    if (u != utf16) {
-+        ngx_free(u);
-+    }
-     return NGX_OK;
- }
- 
-@@ -452,8 +472,12 @@ ngx_read_dir(ngx_dir_t *dir)
+@@ -467,8 +479,12 @@ ngx_read_dir(ngx_dir_t *dir)
          return NGX_OK;
      }
 
@@ -67,7 +71,7 @@ index 55d7f76..bb3960a 100644
          return NGX_OK;
      }
 
-@@ -464,6 +488,7 @@ ngx_read_dir(ngx_dir_t *dir)
+@@ -479,6 +495,7 @@ ngx_read_dir(ngx_dir_t *dir)
  ngx_int_t
  ngx_close_dir(ngx_dir_t *dir)
  {
@@ -76,7 +80,7 @@ index 55d7f76..bb3960a 100644
          return NGX_ERROR;
      }
 diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
-index 895daea..da98307 100644
+index 6eb720e..57bfe7e 100644
 --- a/src/os/win32/ngx_files.h
 +++ b/src/os/win32/ngx_files.h
 @@ -30,7 +30,9 @@ typedef struct {
@@ -90,7 +94,7 @@ index 895daea..da98307 100644
 
      unsigned                        valid_info:1;
      unsigned                        type:1;
-@@ -208,8 +210,8 @@ ngx_int_t ngx_close_dir(ngx_dir_t *dir);
+@@ -205,8 +207,8 @@ ngx_int_t ngx_close_dir(ngx_dir_t *dir);
  #define ngx_dir_access(a)           (a)
 
 
@@ -102,5 +106,5 @@ index 895daea..da98307 100644
  ngx_int_t ngx_de_info(u_char *name, ngx_dir_t *dir);
  #define ngx_de_info_n               "dummy()"
 -- 
-2.18.0
+2.19.1