Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 4429:2d235c76c59e stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4326: Fix for read_head with try_files and open_file_cache. The of.read_ahead wasn't set in try_files code path, causing read_ahead directive to be a nop if try_files and open_file_cache were used.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 04 Feb 2012 22:30:30 +0000
parents efd515ace6bb
children 4919fb357a5d
comparison
equal deleted inserted replaced
4428:9ea9de0fb8d4 4429:2d235c76c59e
1287 return NGX_OK; 1287 return NGX_OK;
1288 } 1288 }
1289 1289
1290 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); 1290 ngx_memzero(&of, sizeof(ngx_open_file_info_t));
1291 1291
1292 of.read_ahead = clcf->read_ahead;
1292 of.directio = clcf->directio; 1293 of.directio = clcf->directio;
1293 of.valid = clcf->open_file_cache_valid; 1294 of.valid = clcf->open_file_cache_valid;
1294 of.min_uses = clcf->open_file_cache_min_uses; 1295 of.min_uses = clcf->open_file_cache_min_uses;
1295 of.test_only = 1; 1296 of.test_only = 1;
1296 of.errors = clcf->open_file_cache_errors; 1297 of.errors = clcf->open_file_cache_errors;