Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_module.c @ 5940:e3b3b89d74e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: fixed inheritance of proxy_store and friends. The proxy_store, fastcgi_store, scgi_store and uwsgi_store were inherited incorrectly if a directive with variables was defined, and then redefined to the "on" value, i.e. in configurations like: proxy_store /data/www$upstream_http_x_store; location / { proxy_store on; }
author Valentin Bartenev <vbart@nginx.com>
date Thu, 09 Oct 2014 20:30:11 +0400
parents cd2abf7e7740
children d9025ea1f5a5
comparison
equal deleted inserted replaced
5939:aeea0522332f 5940:e3b3b89d74e8
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 (conf->upstream.store != 0) { 2435 if (conf->upstream.store == NGX_CONF_UNSET) {
2436 ngx_conf_merge_value(conf->upstream.store, 2436 ngx_conf_merge_value(conf->upstream.store,
2437 prev->upstream.store, 0); 2437 prev->upstream.store, 0);
2438 2438
2439 if (conf->upstream.store_lengths == NULL) { 2439 if (conf->upstream.store_lengths == NULL) {
2440 conf->upstream.store_lengths = prev->upstream.store_lengths; 2440 conf->upstream.store_lengths = prev->upstream.store_lengths;