Mercurial > hg > nginx
diff src/http/ngx_http_file_cache.c @ 3195:b495a56f1f24
use real file cache length, this fixes cache size counting for responses
without "Content-Length" header and 304 responses.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 07 Oct 2009 12:55:58 +0000 |
| parents | 975f0558aab3 |
| children | 04cfc09b8b8d |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -692,7 +692,7 @@ ngx_http_file_cache_set_header(ngx_http_ void ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf) { - off_t size; + off_t size, length; ngx_int_t rc; ngx_file_uniq_t uniq; ngx_file_info_t fi; @@ -714,6 +714,7 @@ ngx_http_file_cache_update(ngx_http_requ cache = c->file_cache; uniq = 0; + length = 0; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http file cache rename: \"%s\" to \"%s\"", @@ -738,10 +739,11 @@ ngx_http_file_cache_update(ngx_http_requ } else { uniq = ngx_file_uniq(&fi); + length = ngx_file_size(&fi); } } - size = (c->length + cache->bsize - 1) / cache->bsize; + size = (length + cache->bsize - 1) / cache->bsize; ngx_shmtx_lock(&cache->shpool->mutex); @@ -751,7 +753,7 @@ ngx_http_file_cache_update(ngx_http_requ size = size - (c->node->length + cache->bsize - 1) / cache->bsize; - c->node->length = c->length; + c->node->length = length; cache->sh->size += size;