Mercurial > hg > nginx-vendor-current
comparison src/core/ngx_open_file_cache.c @ 410:a8e3f1441eec NGINX_0_7_17
nginx 0.7.17
*) Feature: now the "directio" directive works on Linux.
*) Feature: the $pid variable.
*) Bugfix: the "directio" optimization that had appeared in 0.7.15 did
not work with open_file_cache.
*) Bugfix: the "access_log" with variables did not work on Linux; the
bug had appeared in 0.7.7.
*) Bugfix: the ngx_http_charset_module did not understand quoted
charset name received from backend.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 15 Sep 2008 00:00:00 +0400 |
| parents | 79c5df00501e |
| children | 6281966854a5 |
comparison
equal
deleted
inserted
replaced
| 409:f6561f721532 | 410:a8e3f1441eec |
|---|---|
| 203 | 203 |
| 204 of->is_dir = file->is_dir; | 204 of->is_dir = file->is_dir; |
| 205 of->is_file = file->is_file; | 205 of->is_file = file->is_file; |
| 206 of->is_link = file->is_link; | 206 of->is_link = file->is_link; |
| 207 of->is_exec = file->is_exec; | 207 of->is_exec = file->is_exec; |
| 208 of->is_directio = file->is_directio; | |
| 208 | 209 |
| 209 if (!file->is_dir) { | 210 if (!file->is_dir) { |
| 210 file->count++; | 211 file->count++; |
| 211 ngx_open_file_add_event(cache, file, of, pool->log); | 212 ngx_open_file_add_event(cache, file, of, pool->log); |
| 212 } | 213 } |
| 358 | 359 |
| 359 file->is_dir = of->is_dir; | 360 file->is_dir = of->is_dir; |
| 360 file->is_file = of->is_file; | 361 file->is_file = of->is_file; |
| 361 file->is_link = of->is_link; | 362 file->is_link = of->is_link; |
| 362 file->is_exec = of->is_exec; | 363 file->is_exec = of->is_exec; |
| 364 file->is_directio = of->is_directio; | |
| 363 | 365 |
| 364 if (!of->is_dir) { | 366 if (!of->is_dir) { |
| 365 file->count++; | 367 file->count++; |
| 366 } | 368 } |
| 367 } | 369 } |
| 497 | 499 |
| 498 } else { | 500 } else { |
| 499 of->fd = fd; | 501 of->fd = fd; |
| 500 | 502 |
| 501 if (of->directio <= ngx_file_size(&fi)) { | 503 if (of->directio <= ngx_file_size(&fi)) { |
| 502 if (ngx_directio(fd) == -1) { | 504 if (ngx_directio_on(fd) == -1) { |
| 503 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | 505 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
| 504 ngx_directio_n " \"%s\" failed", name); | 506 ngx_directio_on_n " \"%s\" failed", name); |
| 505 | 507 |
| 506 } else { | 508 } else { |
| 507 of->is_directio = 1; | 509 of->is_directio = 1; |
| 508 } | 510 } |
| 509 } | 511 } |