merge r3017, r3018, r3019, r3020, r3021, r3022, r3023, r3196:

cache management fixes:

*) separate cache loader process
*) use real file cache length, this fixes cache size counting for responses
   without "Content-Length" header and 304 responses.

1 files changed, 1 insertions, 0 deletions

diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h
index 1ee80751d..6ac6fd876 100644
--- a/src/http/ngx_http_cache.h
+++ b/src/http/ngx_http_cache.h
@@ -97,6 +97,7 @@ typedef struct {
     ngx_rbtree_node_t                sentinel;
     ngx_queue_t                      queue;
     ngx_atomic_t                     cold;
+    ngx_atomic_t                     loading;
     off_t                            size;
 } ngx_http_file_cache_sh_t;