# HG changeset patch # User Igor Sysoev # Date 1214489279 0 # Node ID 75a8d34459c59e796ee3cea5d6389947fd0a2800 # Parent 5657037448d1b0d56dc40b1c0af4d0cdbcfb033f ngx_memzero() ngx_open_file_info_t diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c --- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -105,8 +105,8 @@ ngx_http_flv_handler(ngx_http_request_t clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors; diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c --- a/src/http/modules/ngx_http_gzip_static_module.c +++ b/src/http/modules/ngx_http_gzip_static_module.c @@ -119,8 +119,8 @@ ngx_http_gzip_static_handler(ngx_http_re clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors; diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c --- a/src/http/modules/ngx_http_index_module.c +++ b/src/http/modules/ngx_http_index_module.c @@ -208,8 +208,8 @@ ngx_http_index_handler(ngx_http_request_ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "open index \"%V\"", &path); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors; @@ -292,10 +292,10 @@ ngx_http_index_test_dir(ngx_http_request ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http index check dir: \"%V\"", &dir); - of.uniq = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.test_dir = 1; of.valid = clcf->open_file_cache_valid; - of.min_uses = 0; of.errors = clcf->open_file_cache_errors; if (ngx_open_cached_file(clcf->open_file_cache, &dir, &of, r->pool) diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c --- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -96,8 +96,8 @@ ngx_http_static_handler(ngx_http_request clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors; diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs --- a/src/http/modules/perl/nginx.xs +++ b/src/http/modules/perl/nginx.xs @@ -650,8 +650,8 @@ sendfile(r, filename, offset = -1, bytes clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors; diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c --- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -994,8 +994,8 @@ ngx_http_script_file_code(ngx_http_scrip clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - of.uniq = 0; - of.test_dir = 0; + ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;