From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 25 Sep 2009 11:55:33 +0000 (+0000)
Subject: fix discarding body
X-Git-Tag: release-0.8.17~8
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=812234e2f5b063811d9ea39affe29f60f50fefc1;p=nginx.git

fix discarding body
---

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index d29314747..dc593f10b 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -562,12 +562,16 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http read discarded body");
 
-    do {
+    for ( ;; ) {
         if (r->headers_in.content_length_n == 0) {
             r->read_event_handler = ngx_http_block_reading;
             return NGX_OK;
         }
 
+        if (!r->connection->read->ready) {
+            return NGX_AGAIN;
+        }
+
         size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
                    NGX_HTTP_DISCARD_BUFFER_SIZE:
                    (size_t) r->headers_in.content_length_n;
@@ -588,10 +592,7 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
         }
 
         r->headers_in.content_length_n -= n;
-
-    } while (r->connection->read->ready);
-
-    return NGX_AGAIN;
+    }
 }