Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 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 | f1a7633b20a4 |
| children | ed3d0cc6de5a ba2c7463ce18 |
comparison
equal
deleted
inserted
replaced
| 4660:6c20a377b883 | 4661:eb565752dd8e |
|---|---|
| 2597 | 2597 |
| 2598 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); | 2598 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); |
| 2599 | 2599 |
| 2600 r->phase_handler = cmcf->phase_engine.location_rewrite_index; | 2600 r->phase_handler = cmcf->phase_engine.location_rewrite_index; |
| 2601 | 2601 |
| 2602 r->write_event_handler = ngx_http_core_run_phases; | |
| 2602 ngx_http_core_run_phases(r); | 2603 ngx_http_core_run_phases(r); |
| 2603 | 2604 |
| 2604 return NGX_DONE; | 2605 return NGX_DONE; |
| 2605 } | 2606 } |
| 2606 } | 2607 } |