From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 13 Jun 2018 12:28:11 +0000 (+0300)
Subject: Upstream: disable body cleanup with preserve_output (ticket #1565).
X-Git-Tag: release-1.14.2~15
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=4050b961af7217e115964443cb7500bf7e02e64e;p=nginx.git

Upstream: disable body cleanup with preserve_output (ticket #1565).

With u->conf->preserve_output set the request body file might be used
after the response header is sent, so avoid cleaning it.  (Normally
this is not a problem as u->conf->preserve_output is only set with
r->request_body_no_buffering, but the request body might be already
written to a file in a different context.)
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 8fc3042e7..47cc6cc55 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2901,7 +2901,8 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
     }
 
     if (r->request_body && r->request_body->temp_file
-        && r == r->main && !r->preserve_body)
+        && r == r->main && !r->preserve_body
+        && !u->conf->preserve_output)
     {
         ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
         r->request_body->temp_file->file.fd = NGX_INVALID_FILE;