From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 19 Dec 2011 14:11:48 +0000 (+0000)
Subject: Added clearing of r->valid_unparsed_uri on internal redirects.
X-Git-Tag: release-1.1.12~14
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=d79f4523f8c3b156be4f80fa1f1615217e30bbfa;p=nginx.git

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.
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 3c5711748..1d5ee5dc6 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2506,6 +2506,7 @@ ngx_http_internal_redirect(ngx_http_request_t *r,
 #endif
 
     r->internal = 1;
+    r->valid_unparsed_uri = 0;
     r->add_uri_to_alias = 0;
     r->main->count++;
 
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 9f0ff3a54..68837d8b9 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1895,8 +1895,6 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
             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;