Mercurial > hg > nginx
comparison src/http/modules/ngx_http_uwsgi_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 | cd2abf7e7740 |
| children | d9025ea1f5a5 |
comparison
equal
deleted
inserted
replaced
| 5939:aeea0522332f | 5940:e3b3b89d74e8 |
|---|---|
| 1398 size_t size; | 1398 size_t size; |
| 1399 ngx_int_t rc; | 1399 ngx_int_t rc; |
| 1400 ngx_hash_init_t hash; | 1400 ngx_hash_init_t hash; |
| 1401 ngx_http_core_loc_conf_t *clcf; | 1401 ngx_http_core_loc_conf_t *clcf; |
| 1402 | 1402 |
| 1403 if (conf->upstream.store != 0) { | 1403 if (conf->upstream.store == NGX_CONF_UNSET) { |
| 1404 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); | 1404 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); |
| 1405 | 1405 |
| 1406 if (conf->upstream.store_lengths == NULL) { | 1406 if (conf->upstream.store_lengths == NULL) { |
| 1407 conf->upstream.store_lengths = prev->upstream.store_lengths; | 1407 conf->upstream.store_lengths = prev->upstream.store_lengths; |
| 1408 conf->upstream.store_values = prev->upstream.store_values; | 1408 conf->upstream.store_values = prev->upstream.store_values; |