[nginx] svn commit: r4788 - in branches/stable-1.2: . src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 15:20:03 +0000 (Mon, 06 Aug 2012)
New Revision: 4788
URL: http://trac.nginx.org/nginx/changeset/4788/nginx

Log:
Merge of r4737: r->uri_changed in a named location fix.

Reset r->uri_changed in a named location (ticket #184).


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_core_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 14:58:36 UTC (rev 4787)
+++ branches/stable-1.2	2012-08-06 15:20:03 UTC (rev 4788)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4737
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_core_module.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_core_module.c	2012-08-06 14:58:36 UTC (rev 4787)
+++ branches/stable-1.2/src/http/ngx_http_core_module.c	2012-08-06 15:20:03 UTC (rev 4788)
@@ -2588,6 +2588,7 @@
 
             r->internal = 1;
             r->content_handler = NULL;
+            r->uri_changed = 0;
             r->loc_conf = (*clcfp)->loc_conf;
 
             /* clear the modules contexts */