summaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_files.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/unix/ngx_files.c')
-rw-r--r--src/os/unix/ngx_files.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index e2148d843..d3abdd9e2 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -265,10 +265,14 @@ ngx_open_glob(ngx_glob_t *gl)
return NGX_OK;
}
+#ifdef GLOB_NOMATCH
+
if (n == GLOB_NOMATCH && gl->test) {
return NGX_OK;
}
+#endif
+
return NGX_ERROR;
}
@@ -276,7 +280,7 @@ ngx_open_glob(ngx_glob_t *gl)
ngx_int_t
ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
{
- if (gl->n < (size_t) gl->pglob.gl_pathc) {
+ if (gl->n < (size_t) gl->pglob.gl_matchc) {
name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
name->data = (u_char *) gl->pglob.gl_pathv[gl->n];