mirror of
https://github.com/nginx/nginx.git
synced 2026-05-28 04:12:47 -04:00
Merge abd92d41ec into d44205284f
This commit is contained in:
commit
a3517ba047
4 changed files with 36 additions and 0 deletions
|
|
@ -3166,6 +3166,15 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
if (conf->upstream.cache_min_uses != NGX_CONF_UNSET_UINT
|
||||
&& conf->upstream.cache_min_uses > 1023)
|
||||
{
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"\"fastcgi_cache_min_uses\" value %ui exceeds 1023 "
|
||||
"and effectively disables caching",
|
||||
conf->upstream.cache_min_uses);
|
||||
}
|
||||
|
||||
ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
|
||||
prev->upstream.cache_min_uses, 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -3822,6 +3822,15 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
if (conf->upstream.cache_min_uses != NGX_CONF_UNSET_UINT
|
||||
&& conf->upstream.cache_min_uses > 1023)
|
||||
{
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"\"proxy_cache_min_uses\" value %ui exceeds 1023 "
|
||||
"and effectively disables caching",
|
||||
conf->upstream.cache_min_uses);
|
||||
}
|
||||
|
||||
ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
|
||||
prev->upstream.cache_min_uses, 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -1579,6 +1579,15 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
if (conf->upstream.cache_min_uses != NGX_CONF_UNSET_UINT
|
||||
&& conf->upstream.cache_min_uses > 1023)
|
||||
{
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"\"scgi_cache_min_uses\" value %ui exceeds 1023 "
|
||||
"and effectively disables caching",
|
||||
conf->upstream.cache_min_uses);
|
||||
}
|
||||
|
||||
ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
|
||||
prev->upstream.cache_min_uses, 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -1841,6 +1841,15 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
if (conf->upstream.cache_min_uses != NGX_CONF_UNSET_UINT
|
||||
&& conf->upstream.cache_min_uses > 1023)
|
||||
{
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"\"uwsgi_cache_min_uses\" value %ui exceeds 1023 "
|
||||
"and effectively disables caching",
|
||||
conf->upstream.cache_min_uses);
|
||||
}
|
||||
|
||||
ngx_conf_merge_uint_value(conf->upstream.cache_min_uses,
|
||||
prev->upstream.cache_min_uses, 1);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue