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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-05-04 11:35:22 +0000 (Fri, 04 May 2012)
New Revision: 4615
URL: http://trac.nginx.org/nginx/changeset/4615/nginx

Log:
Added write event 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:
   trunk/src/http/ngx_http_core_module.c

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c	2012-04-29 22:02:18 UTC (rev 4614)
+++ trunk/src/http/ngx_http_core_module.c	2012-05-04 11:35:22 UTC (rev 4615)
@@ -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;