IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for proxy_store leaving temporary files for subrequests.

Browse Source 
Temporary files might not be removed if the "proxy_store" or "fastcgi_store"
directives were used for subrequests (e.g. ssi includes) and client closed
connection prematurely.

Non-active subrequests are finalized out of the control of the upstream
module when client closes a connection.  As a result, the code to remove
unfinished temporary files in ngx_http_upstream_process_request() wasn't
executed.

Fix is to move relevant code into ngx_http_upstream_finalize_request() which
is called in all cases, either directly or via the cleanup handler.
This commit is contained in:
Maxim Dounin 2012-02-13 15:28:19 +00:00
parent 71ce7a13ed
commit 01c133cda4
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/http/ngx_http_upstream.c
View File

@ -2651,7 +2651,6 @@ ngx_http_upstream_process_upstream(ngx_http_request_t *r,
static void static void
ngx_http_upstream_process_request(ngx_http_request_t *r) ngx_http_upstream_process_request(ngx_http_request_t *r)
{ {
ngx_uint_t del;
ngx_temp_file_t *tf; ngx_temp_file_t *tf;
ngx_event_pipe_t *p; ngx_event_pipe_t *p;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
@ -2663,30 +2662,16 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
if (u->store) { if (u->store) {
del = p->upstream_error;
tf = u->pipe->temp_file;
if (p->upstream_eof || p->upstream_done) { if (p->upstream_eof || p->upstream_done) {
tf = u->pipe->temp_file;
if (u->headers_in.status_n == NGX_HTTP_OK if (u->headers_in.status_n == NGX_HTTP_OK
&& (u->headers_in.content_length_n == -1 && (u->headers_in.content_length_n == -1
|| (u->headers_in.content_length_n == tf->offset))) || (u->headers_in.content_length_n == tf->offset)))
{ {
ngx_http_upstream_store(r, u); ngx_http_upstream_store(r, u);
u->store = 0;
} else {
del = 1;
}
}
if (del && tf->file.fd != NGX_INVALID_FILE) {
if (ngx_delete_file(tf->file.name.data) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
ngx_delete_file_n " \"%s\" failed",
u->pipe->temp_file->file.name.data);
} }
} }
} }
@ -3049,6 +3034,18 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
u->pipe->temp_file->file.fd); u->pipe->temp_file->file.fd);
} }
if (u->store && u->pipe && u->pipe->temp_file
&& u->pipe->temp_file->file.fd != NGX_INVALID_FILE)
{
if (ngx_delete_file(u->pipe->temp_file->file.name.data)
== NGX_FILE_ERROR)
{
ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
ngx_delete_file_n " \"%s\" failed",
u->pipe->temp_file->file.name.data);
}
}
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
if (r->cache) { if (r->cache) {