[nginx] svn commit: r4423 - trunk/src/http/modules

[vbart at nginx.com]

Author: vbart
Date: 2012-01-30 11:22:56 +0000 (Mon, 30 Jan 2012)
New Revision: 4423

Modified:
   trunk/src/http/modules/ngx_http_proxy_module.c
Log:
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
          }
      }
  }



Modified: trunk/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_proxy_module.c	2012-01-30 11:12:52 UTC (rev 4422)
+++ trunk/src/http/modules/ngx_http_proxy_module.c	2012-01-30 11:22:56 UTC (rev 4423)
@@ -3292,6 +3292,8 @@
         return NGX_CONF_OK;
     }
 
+    plcf->redirect = 1;
+
     value = cf->args->elts;
 
     if (cf->args->nelts == 2) {