From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 2 Oct 2009 09:46:04 +0000 (+0000)
Subject: update r3167: do not set r->discard_body if the body has been just discarded
X-Git-Tag: release-0.8.18~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=48a3131d8378c7d785c060162a201ea2e5a3b37e;p=nginx.git

update r3167: do not set r->discard_body if the body has been just discarded
---

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index bc2a14e0d..83e2d015b 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -469,8 +469,6 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
         }
     }
 
-    r->discard_body = 1;
-
     r->read_event_handler = ngx_http_read_discarded_request_body_handler;
 
     if (ngx_handle_read_event(rev, 0) != NGX_OK) {
@@ -479,6 +477,7 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
 
     if (ngx_http_read_discarded_request_body(r) != NGX_OK) {
         r->count++;
+        r->discard_body = 1;
     }
 
     return NGX_OK;