]> git.kaiwu.me - nginx.git/commitdiff
fix two previous commits: an early parallel body discarding completion
authorIgor Sysoev <igor@sysoev.ru>
Tue, 20 Oct 2009 11:48:28 +0000 (11:48 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Tue, 20 Oct 2009 11:48:28 +0000 (11:48 +0000)
disables incomplete ngx_http_writer()

src/http/ngx_http_request.c

index 753380682379eaaaa0530e023025919842c441f2..ceb42b3c822896bdb65bdd5d795dd0acae21a408 100644 (file)
@@ -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);
 }