From a13b3b97eafbbe7fa6586e4f73b8c80ee478244c Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 29 Apr 2008 09:28:42 +0000
Subject: ignore glob no match error

---
 src/os/unix/ngx_files.c | 10 +++++++++-
 src/os/unix/ngx_files.h |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/os/unix')

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index a091b9b77..7ee8cbd84 100644
--- 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 85dae3b97..a223b34e8 100644
--- 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;
 
 
-- 
cgit