From b1af9bbcabf1bdbe119366971a2d0f6c3f8f595d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 25 Jun 2004 14:42:03 +0000 Subject: nginx-0.0.7-2004-06-25-18:42:03 import --- src/http/ngx_http_request.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/http/ngx_http_request.c') diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 6a7f7c32a..8ce73cfeb 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1013,6 +1013,7 @@ void ngx_http_finalize_request(ngx_http_request_t *r, int rc) } if (r->connection->write->timer_set) { + r->connection->write->delayed = 0; ngx_del_timer(r->connection->write); } @@ -1055,12 +1056,12 @@ static void ngx_http_set_write_handler(ngx_http_request_t *r) wev = r->connection->write; wev->event_handler = ngx_http_writer; + r->http_state = NGX_HTTP_WRITING_REQUEST_STATE; + if (wev->ready && wev->delayed) { return; } - r->http_state = NGX_HTTP_WRITING_REQUEST_STATE; - clcf = ngx_http_get_module_loc_conf(r->main ? r->main : r, ngx_http_core_module); if (!wev->delayed) { -- cgit v1.2.3