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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-06-04 10:52:43 +0000 (Mon, 04 Jun 2012)
New Revision: 4662
URL: http://trac.nginx.org/nginx/changeset/4662/nginx

Log:
Merge of r4615: write handler reset in ngx_http_named_location().

On internal redirects this happens via ngx_http_handler() call, which is
not called on named location redirect.  As a result incorrect write handler
remained (if previously set) and this might cause incorrect behaviour (likely
request hang).

Patch by Yichun Zhang (agentzh).


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-06-04 10:33:38 UTC (rev 4661)
+++ branches/stable-1.2	2012-06-04 10:52:43 UTC (rev 4662)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4613,4620
+/trunk:4611-4613,4615,4620
\ 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-06-04 10:33:38 UTC (rev 4661)
+++ branches/stable-1.2/src/http/ngx_http_core_module.c	2012-06-04 10:52:43 UTC (rev 4662)
@@ -2599,6 +2599,7 @@
 
             r->phase_handler = cmcf->phase_engine.location_rewrite_index;
 
+            r->write_event_handler = ngx_http_core_run_phases;
             ngx_http_core_run_phases(r);
 
             return NGX_DONE;