open_file_cache_retest > open_file_cache_valid
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index 36e297e..a05bbcf 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -189,7 +189,7 @@
ngx_queue_remove(&file->queue);
- if (file->event || now - file->created < of->retest) {
+ if (file->event || now - file->created < of->valid) {
if (file->err == 0) {
of->fd = file->fd;
of->uniq = file->uniq;
diff --git a/src/core/ngx_open_file_cache.h b/src/core/ngx_open_file_cache.h
index 50d910c..6865f68 100644
--- a/src/core/ngx_open_file_cache.h
+++ b/src/core/ngx_open_file_cache.h
@@ -19,7 +19,7 @@
off_t size;
ngx_err_t err;
- time_t retest;
+ time_t valid;
unsigned test_dir:1;
unsigned errors:1;
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index a151939..2c14d29 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -106,7 +106,7 @@
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
of.test_dir = 0;
- of.retest = clcf->open_file_cache_retest;
+ of.valid = clcf->open_file_cache_valid;
of.errors = clcf->open_file_cache_errors;
of.events = clcf->open_file_cache_events;
diff --git a/src/http/modules/ngx_http_index_module.c b/src/http/modules/ngx_http_index_module.c
index 7eeaf0a..a82b318 100644
--- a/src/http/modules/ngx_http_index_module.c
+++ b/src/http/modules/ngx_http_index_module.c
@@ -209,7 +209,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "open index \"%V\"", &path);
of.test_dir = 0;
- of.retest = clcf->open_file_cache_retest;
+ of.valid = clcf->open_file_cache_valid;
of.errors = clcf->open_file_cache_errors;
of.events = clcf->open_file_cache_events;
@@ -292,7 +292,7 @@
"http index check dir: \"%V\"", &dir);
of.test_dir = 1;
- of.retest = clcf->open_file_cache_retest;
+ of.valid = clcf->open_file_cache_valid;
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
index 3da2f7a..e89b1cd 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -97,7 +97,7 @@
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
of.test_dir = 0;
- of.retest = clcf->open_file_cache_retest;
+ of.valid = clcf->open_file_cache_valid;
of.errors = clcf->open_file_cache_errors;
of.events = clcf->open_file_cache_events;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index dbfa91a..066e129 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -85,6 +85,10 @@
ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
};
+static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = {
+ ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid"
+};
+
static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = {
{ ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF },
@@ -473,12 +477,19 @@
offsetof(ngx_http_core_loc_conf_t, open_file_cache),
NULL },
+ { ngx_string("open_file_cache_valid"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_sec_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid),
+ NULL },
+
{ ngx_string("open_file_cache_retest"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_sec_slot,
NGX_HTTP_LOC_CONF_OFFSET,
- offsetof(ngx_http_core_loc_conf_t, open_file_cache_retest),
- NULL },
+ offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid),
+ &ngx_conf_deprecated_open_file_cache_retest },
{ ngx_string("open_file_cache_errors"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
@@ -2417,7 +2428,7 @@
lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
lcf->open_file_cache = NGX_CONF_UNSET_PTR;
- lcf->open_file_cache_retest = NGX_CONF_UNSET;
+ lcf->open_file_cache_valid = NGX_CONF_UNSET;
lcf->open_file_cache_errors = NGX_CONF_UNSET;
lcf->open_file_cache_events = NGX_CONF_UNSET;
@@ -2620,8 +2631,8 @@
ngx_conf_merge_ptr_value(conf->open_file_cache,
prev->open_file_cache, NULL);
- ngx_conf_merge_sec_value(conf->open_file_cache_retest,
- prev->open_file_cache_retest, 60);
+ ngx_conf_merge_sec_value(conf->open_file_cache_valid,
+ prev->open_file_cache_valid, 60);
ngx_conf_merge_sec_value(conf->open_file_cache_errors,
prev->open_file_cache_errors, 0);
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 2027f51..d08e9b1 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -295,7 +295,7 @@
ngx_path_t *client_body_temp_path; /* client_body_temp_path */
ngx_open_file_cache_t *open_file_cache;
- time_t open_file_cache_retest;
+ time_t open_file_cache_valid;
ngx_flag_t open_file_cache_errors;
ngx_flag_t open_file_cache_events;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 96f618a..0ae27aa 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -976,7 +976,7 @@
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
of.test_dir = 0;
- of.retest = clcf->open_file_cache_retest;
+ of.valid = clcf->open_file_cache_valid;
of.errors = clcf->open_file_cache_errors;
of.events = clcf->open_file_cache_events;
