Mercurial > hg > nginx
changeset 7297:a10e5fe44762
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.)
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 13 Jun 2018 15:28:11 +0300 |
parents | 8e6bb4e6045f |
children | f37d8fb25de5 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Thu Jun 07 20:04:22 2018 +0300 +++ b/src/http/ngx_http_upstream.c Wed Jun 13 15:28:11 2018 +0300 @@ -2901,7 +2901,8 @@ } 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;