ignore glob no match error

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 54769fbe00a26616b4e819b5662a8dee2a77774f..6efcd8b7d3392acb45eab0a17464022558e79b86 100644 (file)
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -645,10 +645,18 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
+    if (strpbrk((char *) file.data, "*?[") == NULL) {
+
+        ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
+
+        return ngx_conf_parse(cf, &file);
+    }
+
     ngx_memzero(&gl, sizeof(ngx_glob_t));
 
     gl.pattern = file.data;
     gl.log = cf->log;
+    gl.test = 1;
 
     if (ngx_open_glob(&gl) != NGX_OK) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index a091b9b77621025150c0b0b4ee748e0f9ba08dfa..7ee8cbd84240d806b36648a16cdcbc316358d5da 100644 (file)
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -257,7 +257,15 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
 ngx_int_t
 ngx_open_glob(ngx_glob_t *gl)
 {
-    if (glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob) == 0) {
+    int  n;
+
+    n = glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob);
+
+    if (n == 0) {
+        return NGX_OK;
+    }
+
+    if (n == GLOB_NOMATCH && gl->test) {
         return NGX_OK;
     }
 

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 85dae3b97e7fc3efcfad0b6d3d41e19c20bc594b..a223b34e834c4de29efa1b147747a103af9f1b51 100644 (file)
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -154,10 +154,11 @@ ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
 
 
 typedef struct {
-    size_t      n;
-    glob_t      pglob;
-    u_char     *pattern;
-    ngx_log_t  *log;
+    size_t       n;
+    glob_t       pglob;
+    u_char      *pattern;
+    ngx_log_t   *log;
+    ngx_uint_t   test;
 } ngx_glob_t;
 
 

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 9e5feba0eb2b42404e8ee145705eb101c95dc33d..769519856cf3e6a93c193163b6817a7ad53dabc5 100644 (file)
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -361,6 +361,12 @@ ngx_open_glob(ngx_glob_t *gl)
     gl->dir = FindFirstFile((const char *) gl->pattern, &gl->finddata);
 
     if (gl->dir == INVALID_HANDLE_VALUE) {
+
+        if (ngx_errno == ERROR_FILE_NOT_FOUND && gl->test) {
+            gl->no_match = 1;
+            return NGX_OK;
+        }
+
         return NGX_ERROR;
     }
 
@@ -394,6 +400,10 @@ ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
     size_t     len;
     ngx_err_t  err;
 
+    if (gl->no_match) {
+        return NGX_DONE;
+    }
+
     if (gl->ready) {
         *name = gl->name;
 
@@ -443,6 +453,10 @@ ngx_close_glob(ngx_glob_t *gl)
         ngx_free(gl->name.data);
     }
 
+    if (gl->dir == INVALID_HANDLE_VALUE) {
+        return;
+    }
+
     if (FindClose(gl->dir) == 0) {
         ngx_log_error(NGX_LOG_ALERT, gl->log, ngx_errno,
                       "FindClose(%s) failed", gl->pattern);

diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 799e0b0c479732aecaf60a36c09219943a183334..5f926417cbc4220cca7a9bfdc89df7604df72ee9 100644 (file)
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -184,7 +184,11 @@ ngx_int_t ngx_de_link_info(u_char *name, ngx_dir_t *dir);
 typedef struct {
     HANDLE            dir;
     WIN32_FIND_DATA   finddata;
-    ngx_int_t         ready;
+
+    unsigned          ready:1;
+    unsigned          test:1;
+    unsigned          no_match:1;
+
     u_char           *pattern;
     ngx_str_t         name;
     size_t            last;