Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_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
1184 size_t size; 1184 size_t size;
1185 ngx_int_t rc; 1185 ngx_int_t rc;
1186 ngx_hash_init_t hash; 1186 ngx_hash_init_t hash;
1187 ngx_http_core_loc_conf_t *clcf; 1187 ngx_http_core_loc_conf_t *clcf;
1188 1188
1189 if (conf->upstream.store != 0) { 1189 if (conf->upstream.store == NGX_CONF_UNSET) {
1190 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); 1190 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
1191 1191
1192 if (conf->upstream.store_lengths == NULL) { 1192 if (conf->upstream.store_lengths == NULL) {
1193 conf->upstream.store_lengths = prev->upstream.store_lengths; 1193 conf->upstream.store_lengths = prev->upstream.store_lengths;
1194 conf->upstream.store_values = prev->upstream.store_values; 1194 conf->upstream.store_values = prev->upstream.store_values;