Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 5940:e3b3b89d74e8
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 | aeea0522332f |
| children | d9025ea1f5a5 |
comparison
equal
deleted
inserted
replaced
| 5939:aeea0522332f | 5940:e3b3b89d74e8 |
|---|---|
| 2622 ngx_hash_init_t hash; | 2622 ngx_hash_init_t hash; |
| 2623 ngx_http_core_loc_conf_t *clcf; | 2623 ngx_http_core_loc_conf_t *clcf; |
| 2624 ngx_http_proxy_rewrite_t *pr; | 2624 ngx_http_proxy_rewrite_t *pr; |
| 2625 ngx_http_script_compile_t sc; | 2625 ngx_http_script_compile_t sc; |
| 2626 | 2626 |
| 2627 if (conf->upstream.store != 0) { | 2627 if (conf->upstream.store == NGX_CONF_UNSET) { |
| 2628 ngx_conf_merge_value(conf->upstream.store, | 2628 ngx_conf_merge_value(conf->upstream.store, |
| 2629 prev->upstream.store, 0); | 2629 prev->upstream.store, 0); |
| 2630 | 2630 |
| 2631 if (conf->upstream.store_lengths == NULL) { | 2631 if (conf->upstream.store_lengths == NULL) { |
| 2632 conf->upstream.store_lengths = prev->upstream.store_lengths; | 2632 conf->upstream.store_lengths = prev->upstream.store_lengths; |