Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 5948:f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
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.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Mon, 22 Dec 2014 12:58:59 +0300 |
parents | d9025ea1f5a5 |
children | 634da79665d3 |
comparison
equal
deleted
inserted
replaced
5947:d9025ea1f5a5 | 5948:f2ff0aa89126 |
---|---|
2430 size_t size; | 2430 size_t size; |
2431 ngx_int_t rc; | 2431 ngx_int_t rc; |
2432 ngx_hash_init_t hash; | 2432 ngx_hash_init_t hash; |
2433 ngx_http_core_loc_conf_t *clcf; | 2433 ngx_http_core_loc_conf_t *clcf; |
2434 | 2434 |
2435 #if (NGX_HTTP_CACHE) | |
2436 | |
2437 if (conf->upstream.store > 0) { | |
2438 conf->upstream.cache = NULL; | |
2439 } | |
2440 | |
2441 if (conf->upstream.cache != NGX_CONF_UNSET_PTR | |
2442 && conf->upstream.cache != NULL) | |
2443 { | |
2444 conf->upstream.store = 0; | |
2445 } | |
2446 | |
2447 #endif | |
2448 | |
2435 if (conf->upstream.store == NGX_CONF_UNSET) { | 2449 if (conf->upstream.store == NGX_CONF_UNSET) { |
2436 ngx_conf_merge_value(conf->upstream.store, | 2450 ngx_conf_merge_value(conf->upstream.store, |
2437 prev->upstream.store, 0); | 2451 prev->upstream.store, 0); |
2438 | 2452 |
2439 conf->upstream.store_lengths = prev->upstream.store_lengths; | 2453 conf->upstream.store_lengths = prev->upstream.store_lengths; |