Mercurial > hg > nginx
diff src/event/ngx_event_pipe.c @ 613:c73c5c58c619 release-0.3.28
nginx-0.3.28-RELEASE import
*) Feature: the "restrict_host_names" directive was canceled.
*) Feature: the --with-cpu-opt=ppc64 configuration parameter.
*) Bugfix: on some condition the proxied connection with a client was
terminated prematurely.
Thanks to Vladimir Shutoff.
*) Bugfix: the "X-Accel-Limit-Rate" header line was not taken into
account if the request was redirected using the "X-Accel-Redirect"
header line.
*) Bugfix: the "post_action" directive ran only after a successful
completion of a request.
*) Bugfix: the proxied response body generated by the "post_action"
directive was transferred to a client.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 16 Feb 2006 15:26:46 +0000 |
parents | 284cc140593b |
children | 3681cb9bde7d |
line wrap: on
line diff
--- a/src/event/ngx_event_pipe.c Wed Feb 08 15:33:12 2006 +0000 +++ b/src/event/ngx_event_pipe.c Thu Feb 16 15:26:46 2006 +0000 @@ -60,8 +60,11 @@ return NGX_ABORT; } - if (rev->active) { + if (rev->active && !rev->ready) { ngx_add_timer(rev, p->read_timeout); + + } else if (rev->timer_set) { + ngx_del_timer(rev); } } @@ -71,8 +74,13 @@ return NGX_ABORT; } - if (wev->active && !wev->ready && !wev->delayed) { - ngx_add_timer(wev, p->send_timeout); + if (!wev->delayed) { + if (wev->active && !wev->ready) { + ngx_add_timer(wev, p->send_timeout); + + } else if (wev->timer_set) { + ngx_del_timer(wev); + } } }