[nginx] svn commit: r4376 - trunk/src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2011-12-19 14:11:48 +0000 (Mon, 19 Dec 2011)
New Revision: 4376

Log:
Added clearing of r->valid_unparsed_uri on internal redirects.

This resolves issue with try_files (see ticket #70), configuration like

   location / { try_files $uri /index.php; }
   location /index.php { proxy_pass http://backend; }

caused nginx to use original request uri in a request to a backend.

Historically, not clearing of the r->valid_unparsed_uri on internal redirect
was a feature: it allowed to pass the same request to (another) upstream
server via error_page redirection.  Since then named locations appeared
though, and it's time to start resetting r->valid_unparsed_uri on internal
redirects.  Configurations still using this feature should be converted
to use named locations instead.

Patch by Lanshun Zhou.


Modified:
   trunk/src/http/ngx_http_core_module.c
   trunk/src/http/ngx_http_upstream.c

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c	2011-12-19 13:28:22 UTC (rev 4375)
+++ trunk/src/http/ngx_http_core_module.c	2011-12-19 14:11:48 UTC (rev 4376)
@@ -2506,6 +2506,7 @@
 #endif
 
     r->internal = 1;
+    r->valid_unparsed_uri = 0;
     r->add_uri_to_alias = 0;
     r->main->count++;
 

Modified: trunk/src/http/ngx_http_upstream.c
===================================================================
--- trunk/src/http/ngx_http_upstream.c	2011-12-19 13:28:22 UTC (rev 4375)
+++ trunk/src/http/ngx_http_upstream.c	2011-12-19 14:11:48 UTC (rev 4376)
@@ -1895,8 +1895,6 @@
             r->method = NGX_HTTP_GET;
         }
 
-        r->valid_unparsed_uri = 0;
-
         ngx_http_internal_redirect(r, uri, &args);
         ngx_http_finalize_request(r, NGX_DONE);
         return NGX_DONE;