comparison src/os/unix/ngx_files.c @ 372:6639b93e81b2 NGINX_0_6_30

nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents c5c2b2883984
children 0b6053502c55
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
255 255
256 256
257 ngx_int_t 257 ngx_int_t
258 ngx_open_glob(ngx_glob_t *gl) 258 ngx_open_glob(ngx_glob_t *gl)
259 { 259 {
260 if (glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob) == 0) { 260 int n;
261
262 n = glob((char *) gl->pattern, GLOB_NOSORT, NULL, &gl->pglob);
263
264 if (n == 0) {
265 return NGX_OK;
266 }
267
268 if (n == GLOB_NOMATCH && gl->test) {
261 return NGX_OK; 269 return NGX_OK;
262 } 270 }
263 271
264 return NGX_ERROR; 272 return NGX_ERROR;
265 } 273 }