diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h index 232f09674..697c4d49b 100644 --- a/src/http/ngx_http_cache.h +++ b/src/http/ngx_http_cache.h @@ -13,11 +13,7 @@ #include -/**/ #define NGX_HTTP_CACHE_STALE 1 -#define NGX_HTTP_CACHE_AGED 2 -#define NGX_HTTP_CACHE_THE_SAME 3 -/**/ #define NGX_HTTP_CACHE_KEY_LEN 16 @@ -28,8 +24,6 @@ typedef struct { } ngx_http_cache_valid_t; -/* ngx_http_file_cache_node_t takes exactly 64 bytes on FreeBSD/i386 */ - typedef struct { ngx_rbtree_node_t node; ngx_queue_t queue; @@ -41,8 +35,8 @@ typedef struct { unsigned uses:10; unsigned valid_msec:10; unsigned error:10; - /* 7 unused bits */ unsigned exists:1; + /* 13 unused bits */ ngx_file_uniq_t uniq; time_t expire; diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 23e3503e0..0893c15d0 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -340,8 +340,6 @@ ngx_http_file_cache_open(ngx_http_request_t *r) return NGX_HTTP_CACHE_STALE; } - /* TODO: NGX_HTTP_CACHE_AGED */ - return NGX_OK; }