# HG changeset patch
# User Valentin Bartenev <vbart@nginx.com>
# Date 1327922576 0
# Node ID b1a9d725ab6988f2b59908665527469416e05223
# Parent  fbae1a82de8b4e821b34859bff08fbbabf90a0fe
Fixed proxy_redirect off inheritance.

Example configuration to reproduce:

  server {
      proxy_redirect off;

      location / {
          proxy_pass http://localhost:8000;
          proxy_redirect http://localhost:8000/ /;

          location ~ \.php$ {
              proxy_pass http://localhost:8000;
              # proxy_redirect must be inherited from the level above,
              # but instead it was switched off here
          }
      }
  }

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -3292,6 +3292,8 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, 
         return NGX_CONF_OK;
     }
 
+    plcf->redirect = 1;
+
     value = cf->args->elts;
 
     if (cf->args->nelts == 2) {