From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 20 Oct 2009 11:48:28 +0000 (+0000)
Subject: fix two previous commits: an early parallel body discarding completion
X-Git-Tag: release-0.8.21~16
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=e418e0661cd2e7972e73cd67412d019ce2ed13bf;p=nginx.git

fix two previous commits: an early parallel body discarding completion
disables incomplete ngx_http_writer()
---

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 753380682..ceb42b3c8 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2107,7 +2107,6 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 
         if (r->discard_body) {
             r->read_event_handler = ngx_http_discarded_request_body_handler;
-            r->write_event_handler = ngx_http_request_empty_handler;
 
             if (r->lingering_time == 0) {
                 r->lingering_time = ngx_time()
@@ -2249,6 +2248,8 @@ ngx_http_writer(ngx_http_request_t *r)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0,
                    "http writer done: \"%V?%V\"", &r->uri, &r->args);
 
+    r->write_event_handler = ngx_http_request_empty_handler;
+
     ngx_http_finalize_request(r, rc);
 }