Mercurial > hg > nginx
changeset 4661:eb565752dd8e stable-1.2
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).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 04 Jun 2012 10:52:43 +0000 |
parents | 6c20a377b883 |
children | 979e0f5b196d |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Mon Jun 04 10:33:38 2012 +0000 +++ b/src/http/ngx_http_core_module.c Mon Jun 04 10:52:43 2012 +0000 @@ -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;