commit c562b742d594611acd3fe11d36173b6a028b7c48
author Valentin Bartenev <vbart@nginx.com> Thu Oct 09 20:30:11 2014 +0400
committer Valentin Bartenev <vbart@nginx.com> Thu Oct 09 20:30:11 2014 +0400
tree 9cac34f44f5f148467e1f11910d17740fe02e556
parent f3075296375ec96c707fd479be870b8e38666e13

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;
    }

src/http/modules/ngx_http_proxy_module.c

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index f04436d..c3105e2 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2624,7 +2624,7 @@
     ngx_http_proxy_rewrite_t   *pr;
     ngx_http_script_compile_t   sc;
 
-    if (conf->upstream.store != 0) {
+    if (conf->upstream.store == NGX_CONF_UNSET) {
         ngx_conf_merge_value(conf->upstream.store,
                               prev->upstream.store, 0);