Mercurial > hg > nginx
diff src/http/ngx_http_upstream.c @ 3711:ce6ba077c270
several changes in cache cleanup handling:
*) now ngx_http_file_cache_cleanup() uses ngx_http_file_cache_free()
*) ngx_http_file_cache_free() interface has been changed to accept r->cache
ngx_http_file_cache_cleanup() must use r->cache, but not r, because
there can be several r->cache's during request processing, r->cache may
be NULL at request finalising, etc.
*) test if updating request does not complete correctly
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 28 Jul 2010 15:49:34 +0000 |
parents | 64777690c697 |
children | f0b62d1ac7af |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Tue Jul 27 19:11:17 2010 +0000 +++ b/src/http/ngx_http_upstream.c Wed Jul 28 15:49:34 2010 +0000 @@ -1735,7 +1735,7 @@ r->cache->error = status; } - ngx_http_file_cache_free(r, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file); } #endif ngx_http_upstream_finalize_request(r, u, status); @@ -2189,7 +2189,7 @@ "http cacheable: %d", u->cacheable); if (u->cacheable == 0 && r->cache) { - ngx_http_file_cache_free(r, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file); } #endif @@ -2664,7 +2664,7 @@ ngx_http_file_cache_update(r, u->pipe->temp_file); } else if (p->upstream_error) { - ngx_http_file_cache_free(r, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file); } } @@ -3005,7 +3005,7 @@ } } - ngx_http_file_cache_free(r, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file); } #endif