mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: keep request body file from removal if requested.

Browse Source 
The new request flag "preserve_body" indicates that the request body file should
not be removed by the upstream module because it may be used later by a
subrequest.  The flag is set by the SSI (ticket #585), addition and slice
modules.  Additionally, it is also set by the upstream module when a background
cache update subrequest is started to prevent the request body file removal
after an internal redirect.  Only the main request is now allowed to remove the
file.
This commit is contained in:
Roman Arutyunyan 2017-07-19 20:38:17 +03:00
parent 2c8f93df87
commit a87e05a331
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_addition_filter_module.c
View File

@ -123,6 +123,8 @@ ngx_http_addition_header_filter(ngx_http_request_t *r)
ngx_http_clear_accept_ranges(r);
ngx_http_weak_etag(r);
r->preserve_body = 1;
return ngx_http_next_header_filter(r);
}

2
src/http/modules/ngx_http_slice_filter_module.c
View File

@ -190,6 +190,8 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
return rc;
}
r->preserve_body = 1;
if (r->headers_out.status == NGX_HTTP_PARTIAL_CONTENT) {
if (ctx->start + (off_t) slcf->size <= r->headers_out.content_offset) {
ctx->start = slcf->size

2
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -370,6 +370,8 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
ngx_http_clear_content_length(r);
ngx_http_clear_accept_ranges(r);
r->preserve_body = 1;
if (!slcf->last_modified) {
ngx_http_clear_last_modified(r);
ngx_http_clear_etag(r);

1
src/http/ngx_http_request.h
View File

@ -537,6 +537,7 @@ struct ngx_http_request_s {
unsigned main_filter_need_in_memory:1;
unsigned filter_need_in_memory:1;
unsigned filter_need_temporary:1;
unsigned preserve_body:1;
unsigned allow_ranges:1;
unsigned subrequest_ranges:1;
unsigned single_range:1;

8
src/http/ngx_http_upstream.c
View File

@ -1077,6 +1077,10 @@ ngx_http_upstream_cache_background_update(ngx_http_request_t *r,
return NGX_OK;
}
if (r == r->main) {
r->preserve_body = 1;
}
if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL,
NGX_HTTP_SUBREQUEST_CLONE
|NGX_HTTP_SUBREQUEST_BACKGROUND)
@ -2857,7 +2861,9 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
u->pipe->downstream_error = 1;
}
if (r->request_body && r->request_body->temp_file) {
if (r->request_body && r->request_body->temp_file
&& r == r->main && !r->preserve_body)
{
ngx_pool_run_cleanup_file(r->pool, r->request_body->temp_file->file.fd);
r->request_body->temp_file->file.fd = NGX_INVALID_FILE;
}