From 6019a7621b11f587fd18e1f9823e2438a7e14686 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 16 Jan 2009 13:57:00 +0000 Subject: [PATCH] proxy/fastcgi_store did not delete incomplete files --- src/http/ngx_http_upstream.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index ace467f25..c6d32877c 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2201,6 +2201,7 @@ ngx_http_upstream_process_upstream(ngx_http_request_t *r, static void ngx_http_upstream_process_request(ngx_http_request_t *r) { + ngx_uint_t del; ngx_temp_file_t *tf; ngx_event_pipe_t *p; ngx_http_upstream_t *u; @@ -2212,20 +2213,25 @@ ngx_http_upstream_process_request(ngx_http_request_t *r) if (u->store) { + del = p->upstream_error; + tf = u->pipe->temp_file; - if (p->upstream_eof - && u->headers_in.status_n == NGX_HTTP_OK - && (u->headers_in.content_length_n == -1 - || (u->headers_in.content_length_n == tf->offset))) - { - ngx_http_upstream_store(r, u); + if (p->upstream_eof) { + + if (u->headers_in.status_n == NGX_HTTP_OK + && (u->headers_in.content_length_n == -1 + || (u->headers_in.content_length_n == tf->offset))) + { + ngx_http_upstream_store(r, u); + + } else { + del = 1; + } + } + + if (del && tf->file.fd != NGX_INVALID_FILE) { - } else if ((p->upstream_error - || (p->upstream_eof - && u->headers_in.status_n != NGX_HTTP_OK)) - && 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,