commit 6a2d605bbf2089ad275056ee19ea7e3167429ed9
author Sergey Kandaurov <pluknet@nginx.com> Wed Sep 04 13:33:51 2019 +0300
committer Sergey Kandaurov <pluknet@nginx.com> Wed Sep 04 13:33:51 2019 +0300
tree 1052eb0f4fd8cdd4f95fbe542bd7902f4c893c2e
parent 9701642af39efeb06a119f62bc0255db0a0f0a0f

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.

src/http/ngx_http_core_module.c

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 5a015ea..aa03fd6 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1660,8 +1660,10 @@
     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;