summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-02-04 22:30:30 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-02-04 22:30:30 +0000
commitb720407a891df8dd0b85995b8059c6f6d7649248 (patch)
treedc0a4c3b2b463723e3f5b0cbe68e2c8e252b3cb6
parent65d3ae1715b75539a896f1678611af99b45322a7 (diff)
downloadnginx-b720407a891df8dd0b85995b8059c6f6d7649248.tar.gz
nginx-b720407a891df8dd0b85995b8059c6f6d7649248.tar.bz2
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.
-rw-r--r--src/http/ngx_http_core_module.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c1fab3092..53f569cb8 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1289,6 +1289,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r,
ngx_memzero(&of, sizeof(ngx_open_file_info_t));
+ of.read_ahead = clcf->read_ahead;
of.directio = clcf->directio;
of.valid = clcf->open_file_cache_valid;
of.min_uses = clcf->open_file_cache_min_uses;