Mercurial > hg > nginx-vendor-0-8
comparison src/core/ngx_open_file_cache.c @ 484:ed5e10fb40fc NGINX_0_7_54
nginx 0.7.54
*) Feature: the ngx_http_image_filter_module.
*) Feature: the "proxy_ignore_headers" and "fastcgi_ignore_headers"
directives.
*) Bugfix: a segmentation fault might occur in worker process, if an
"open_file_cache_errors off" directive was used; the bug had
appeared in 0.7.53.
*) Bugfix: the "port_in_redirect off" directive did not work; the bug
had appeared in 0.7.39.
*) Bugfix: improve handling of "select" method errors.
*) Bugfix: of "select() failed (10022: ...)" error in nginx/Windows.
*) Bugfix: in error text descriptions in nginx/Windows; the bug had
appeared in 0.7.53.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 01 May 2009 00:00:00 +0400 |
parents | 392c16f2d858 |
children | 13b908d5338a |
comparison
equal
deleted
inserted
replaced
483:0a2f4b42ddad | 484:ed5e10fb40fc |
---|---|
141 | 141 |
142 if (cache == NULL) { | 142 if (cache == NULL) { |
143 | 143 |
144 if (of->test_only) { | 144 if (of->test_only) { |
145 | 145 |
146 if (ngx_file_info(name->data, &fi) == -1) { | 146 if (ngx_file_info(name->data, &fi) == NGX_FILE_ERROR) { |
147 of->err = ngx_errno; | 147 of->err = ngx_errno; |
148 of->failed = ngx_file_info_n; | 148 of->failed = ngx_file_info_n; |
149 return NGX_ERROR; | 149 return NGX_ERROR; |
150 } | 150 } |
151 | 151 |
232 ngx_open_file_add_event(cache, file, of, pool->log); | 232 ngx_open_file_add_event(cache, file, of, pool->log); |
233 } | 233 } |
234 | 234 |
235 } else { | 235 } else { |
236 of->err = file->err; | 236 of->err = file->err; |
237 of->failed = ngx_open_file_n; | |
237 } | 238 } |
238 | 239 |
239 goto found; | 240 goto found; |
240 } | 241 } |
241 | 242 |
461 ngx_fd_t fd; | 462 ngx_fd_t fd; |
462 ngx_file_info_t fi; | 463 ngx_file_info_t fi; |
463 | 464 |
464 if (of->fd != NGX_INVALID_FILE) { | 465 if (of->fd != NGX_INVALID_FILE) { |
465 | 466 |
466 if (ngx_file_info(name, &fi) == -1) { | 467 if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) { |
467 of->failed = ngx_file_info_n; | 468 of->failed = ngx_file_info_n; |
468 goto failed; | 469 goto failed; |
469 } | 470 } |
470 | 471 |
471 if (of->uniq == ngx_file_uniq(&fi)) { | 472 if (of->uniq == ngx_file_uniq(&fi)) { |
472 goto done; | 473 goto done; |
473 } | 474 } |
474 | 475 |
475 } else if (of->test_dir) { | 476 } else if (of->test_dir) { |
476 | 477 |
477 if (ngx_file_info(name, &fi) == -1) { | 478 if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) { |
478 of->failed = ngx_file_info_n; | 479 of->failed = ngx_file_info_n; |
479 goto failed; | 480 goto failed; |
480 } | 481 } |
481 | 482 |
482 if (ngx_is_dir(&fi)) { | 483 if (ngx_is_dir(&fi)) { |