diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-11-25 19:17:31 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-11-25 19:17:31 +0300 |
commit | f69060481edeaca075669b50e34ca8ec821c2401 (patch) | |
tree | 6fa6907cc2fdfe0ac6bcdf7f63e76a7f8b41f33f /src/http/ngx_http_cache.h | |
parent | 865a7de474a13c5f1202f97fac31565f33a5e1a1 (diff) |
nginx-0.1.9-RELEASE importrelease-0.1.9
*) Bugfix: the proxied request was sent without arguments if the
request contains "//", "/./", "/../" or "%XX".
*) Bugfix: the large compressed responses may be transferred not
completely.
*) Bugfix: the files bigger than 2G was not transferred on Linux that
does not support sendfile64().
*) Bugfix: while the build configuration on Linux the
--with-poll_module parameter was required; the bug had appeared in
0.1.8.
Diffstat (limited to 'src/http/ngx_http_cache.h')
-rw-r--r-- | src/http/ngx_http_cache.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h index 40f4852dd..aa6690265 100644 --- a/src/http/ngx_http_cache.h +++ b/src/http/ngx_http_cache.h @@ -14,11 +14,12 @@ /* - * The 7 uses before an allocation. + * The 3 bits allows the 7 uses before the cache entry allocation. * We can use maximum 7 bits, i.e up to the 127 uses. */ #define NGX_HTTP_CACHE_LAZY_ALLOCATION_BITS 3 + typedef struct { uint32_t crc; ngx_str_t key; @@ -45,7 +46,7 @@ typedef struct { off_t size; ngx_str_t value; } data; -} ngx_http_cache_t; +} ngx_http_cache_entry_t; typedef struct { @@ -62,7 +63,7 @@ typedef struct { #define NGX_HTTP_CACHE_NELTS 4 typedef struct { - ngx_http_cache_t *elts; + ngx_http_cache_entry_t *elts; size_t hash; size_t nelts; time_t life; @@ -76,9 +77,9 @@ typedef struct { typedef struct { ngx_http_cache_hash_t *hash; - ngx_http_cache_t *cache; + ngx_http_cache_entry_t *cache; ngx_file_t file; - ngx_str_t key; + ngx_array_t key; uint32_t crc; u_char md5[16]; ngx_path_t *path; @@ -90,7 +91,10 @@ typedef struct { ssize_t header_size; size_t file_start; ngx_log_t *log; -} ngx_http_cache_ctx_t; + + /* STUB */ + ngx_str_t key0; +} ngx_http_cache_t; @@ -99,6 +103,8 @@ typedef struct { #define NGX_HTTP_CACHE_THE_SAME 3 +#if 0 + ngx_http_cache_t *ngx_http_cache_get(ngx_http_cache_hash_t *cache, ngx_http_cleanup_t *cleanup, ngx_str_t *key, uint32_t *crc); @@ -127,5 +133,7 @@ int ngx_garbage_collector_http_cache_handler(ngx_gc_t *gc, ngx_str_t *name, char *ngx_http_set_cache_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +#endif + #endif /* _NGX_HTTP_CACHE_H_INCLUDED_ */ |