Mercurial > hg > nginx-vendor-current

comparison src/os/unix/ngx_files.c @ 400:6ebbca3d5ed7 NGINX_0_7_12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.12 *) Feature: the "server_name" directive supports empty name "". *) Feature: the "gzip_disable" directive supports special "msie6" mask. *) Bugfix: if the "max_fails=0" parameter was used in upstream with several servers, then a worker process exited on a SIGFPE signal. Thanks to Maxim Dounin. *) Bugfix: a request body was dropped while redirection via an "error_page" directive. *) Bugfix: a full response was returned for request method HEAD while redirection via an "error_page" directive. *) Bugfix: the $r->header_in() method did not return value of the "Host", "User-Agent", and "Connection" request header lines; the bug had appeared in 0.7.0.
author Igor Sysoev <http://sysoev.ru>
date Tue, 26 Aug 2008 00:00:00 +0400
parents 0b6053502c55
children df7b79c859c3
comparison
equal deleted inserted replaced
399:59e324e4d6d3 400:6ebbca3d5ed7
263 263
264 if (n == 0) { 264 if (n == 0) {
265 return NGX_OK; 265 return NGX_OK;
266 } 266 }
267 267
268 #ifdef GLOB_NOMATCH
269
268 if (n == GLOB_NOMATCH && gl->test) { 270 if (n == GLOB_NOMATCH && gl->test) {
269 return NGX_OK; 271 return NGX_OK;
270 } 272 }
271 273
274 #endif
275
272 return NGX_ERROR; 276 return NGX_ERROR;
273 } 277 }
274 278
275 279
276 ngx_int_t 280 ngx_int_t
277 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name) 281 ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name)
278 { 282 {
279 if (gl->n < (size_t) gl->pglob.gl_pathc) { 283 if (gl->n < (size_t) gl->pglob.gl_matchc) {
280 284
281 name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]); 285 name->len = (size_t) ngx_strlen(gl->pglob.gl_pathv[gl->n]);
282 name->data = (u_char *) gl->pglob.gl_pathv[gl->n]; 286 name->data = (u_char *) gl->pglob.gl_pathv[gl->n];
283 gl->n++; 287 gl->n++;
284 288