From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 4 Sep 2019 10:33:51 +0000 (+0300)
Subject: Fixed "return" with discarding invalid chunked body.
X-Git-Tag: release-1.17.4~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=5a2ce3f4ee55eb8903aa9481deaaf402d5a2e805;p=nginx.git

Fixed "return" with discarding invalid chunked body.

When ngx_http_discard_request_body() call was added to ngx_http_send_response(),
there were no return codes other than NGX_OK and NGX_HTTP_INTERNAL_SERVER_ERROR.
Now it can also return NGX_HTTP_BAD_REQUEST, but ngx_http_send_response() still
incorrectly transforms it to NGX_HTTP_INTERNAL_SERVER_ERROR.

The fix is to propagate ngx_http_discard_request_body() errors.
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 5a015ea33..aa03fd617 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1660,8 +1660,10 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
     ngx_buf_t    *b;
     ngx_chain_t   out;
 
-    if (ngx_http_discard_request_body(r) != NGX_OK) {
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+    rc = ngx_http_discard_request_body(r);
+
+    if (rc != NGX_OK) {
+        return rc;
     }
 
     r->headers_out.status = status;