CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-10-21 19:41:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Upstream: mutually exclusive inheritance of "cache" and "store".

Browse source 
Currently, storing and caching mechanisms cannot work together, and a
configuration error is thrown when the proxy_store and proxy_cache
directives (as well as their friends) are configured on the same level.

But configurations like in the example below were allowed and could result
in critical errors in the error log:

    proxy_store on;

    location / {
        proxy_cache one;
    }

Only proxy_store worked in this case.

For more predictable and errorless behavior these directives now prevent
each other from being inherited from the previous level.
This commit is contained in:
Valentin Bartenev 2014-12-22 12:58:59 +03:00
parent 492844dbb1
commit 66dcbab7a1
4 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/http/modules/ngx_http_fastcgi_module.c
View file

@ -2432,6 +2432,20 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_hash_init_t hash;
ngx_http_core_loc_conf_t *clcf;
#if (NGX_HTTP_CACHE)
if (conf->upstream.store > 0) {
conf->upstream.cache = NULL;
}
if (conf->upstream.cache != NGX_CONF_UNSET_PTR
&& conf->upstream.cache != NULL)
{
conf->upstream.store = 0;
}
#endif
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);

14
src/http/modules/ngx_http_proxy_module.c
View file

@ -2624,6 +2624,20 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_proxy_rewrite_t *pr;
ngx_http_script_compile_t sc;
#if (NGX_HTTP_CACHE)
if (conf->upstream.store > 0) {
conf->upstream.cache = NULL;
}
if (conf->upstream.cache != NGX_CONF_UNSET_PTR
&& conf->upstream.cache != NULL)
{
conf->upstream.store = 0;
}
#endif
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);

14
src/http/modules/ngx_http_scgi_module.c
View file

@ -1186,6 +1186,20 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_hash_init_t hash;
ngx_http_core_loc_conf_t *clcf;
#if (NGX_HTTP_CACHE)
if (conf->upstream.store > 0) {
conf->upstream.cache = NULL;
}
if (conf->upstream.cache != NGX_CONF_UNSET_PTR
&& conf->upstream.cache != NULL)
{
conf->upstream.store = 0;
}
#endif
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);

14
src/http/modules/ngx_http_uwsgi_module.c
View file

@ -1400,6 +1400,20 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_hash_init_t hash;
ngx_http_core_loc_conf_t *clcf;
#if (NGX_HTTP_CACHE)
if (conf->upstream.store > 0) {
conf->upstream.cache = NULL;
}
if (conf->upstream.cache != NGX_CONF_UNSET_PTR
&& conf->upstream.cache != NULL)
{
conf->upstream.store = 0;
}
#endif
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);