Mercurial > hg > nginx-vendor-0-7
annotate src/http/ngx_http_cache.h @ 502:89dc5654117c NGINX_0_7_63
nginx 0.7.63
*) Security: now "/../" are disabled in "Destination" request header
line.
*) Change: minimum supported OpenSSL version is 0.9.7.
*) Change: the "ask" parameter of the "ssl_verify_client" directive was
changed to the "optional" parameter and now it checks a client
certificate if it was offered.
Thanks to Brice Figureau.
*) Feature: now the "-V" switch shows TLS SNI support.
*) Feature: the $ssl_client_verify variable.
Thanks to Brice Figureau.
*) Feature: the "ssl_crl" directive.
Thanks to Brice Figureau.
*) Bugfix: the $ssl_client_cert variable usage corrupted memory; the
bug had appeared in 0.7.7.
Thanks to Sergey Zhuravlev.
*) Feature: now the start cache loader runs in a separate process; this
should improve large caches handling.
*) Feature: now temporary files and permanent storage area may reside
at different file systems.
*) Bugfix: nginx counted incorrectly disk cache size.
*) Change: now directive "gzip_disable msie6" does not disable gzipping
for MSIE 6.0 SV1.
*) Bugfix: nginx always added "Vary: Accept-Encoding" response header
line, if both "gzip_static" and "gzip_vary" were on.
*) Feature: the "proxy" parameter of the "geo" directive.
*) Feature: the ngx_http_geoip_module.
*) Feature: the "limit_rate_after" directive.
Thanks to Ivan Debnar.
*) Feature: the "limit_req_log_level" and "limit_conn_log_level"
directives.
*) Bugfix: now "limit_req" directive conforms to the leaky bucket
algorithm.
Thanks to Maxim Dounin.
*) Bugfix: in ngx_http_limit_req_module.
Thanks to Maxim Dounin.
*) Bugfix: now nginx allows underscores in a request method.
*) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did
not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate",
"X-Accel-Buffering", and "X-Accel-Charset" lines from backend
response header.
Thanks to Maxim Dounin.
*) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend
response header lines; the bug had appeared in 0.7.44.
Thanks to Maxim Dounin.
*) Feature: the "image_filter_transparency" directive.
*) Feature: the "image_filter" directive supports variables for setting
size.
*) Bugfix: in PNG alpha-channel support in the
ngx_http_image_filter_module.
*) Bugfix: in transparency support in the ngx_http_image_filter_module.
*) Feature: now several "perl_modules" directives may be used.
*) Bugfix: ngx_http_perl_module responses did not work in subrequests.
*) Bugfix: nginx sent '\0' in a "Location" response header line on
MKCOL request.
Thanks to Xie Zhenye.
*) Bugfix: an "error_page" directive did not redirect a 413 error; the
bug had appeared in 0.6.10.
*) Bugfix: in memory allocation error handling.
Thanks to Maxim Dounin and Kirill A. Korinskiy.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 00:00:00 +0300 |
parents | ed3d382670c7 |
children | 68c0ae0a4959 |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #ifndef _NGX_HTTP_CACHE_H_INCLUDED_ | |
8 #define _NGX_HTTP_CACHE_H_INCLUDED_ | |
9 | |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
13 #include <ngx_http.h> | |
14 | |
15 | |
500 | 16 #define NGX_HTTP_CACHE_MISS 1 |
17 #define NGX_HTTP_CACHE_EXPIRED 2 | |
18 #define NGX_HTTP_CACHE_STALE 3 | |
19 #define NGX_HTTP_CACHE_UPDATING 4 | |
20 #define NGX_HTTP_CACHE_HIT 5 | |
0 | 21 |
464 | 22 #define NGX_HTTP_CACHE_KEY_LEN 16 |
0 | 23 |
24 | |
25 typedef struct { | |
464 | 26 ngx_uint_t status; |
27 time_t valid; | |
28 } ngx_http_cache_valid_t; | |
29 | |
30 | |
31 typedef struct { | |
32 ngx_rbtree_node_t node; | |
33 ngx_queue_t queue; | |
34 | |
35 u_char key[NGX_HTTP_CACHE_KEY_LEN | |
36 - sizeof(ngx_rbtree_key_t)]; | |
37 | |
38 unsigned count:20; | |
39 unsigned uses:10; | |
40 unsigned valid_msec:10; | |
41 unsigned error:10; | |
42 unsigned exists:1; | |
496 | 43 unsigned updating:1; |
44 /* 12 unused bits */ | |
464 | 45 |
46 ngx_file_uniq_t uniq; | |
47 time_t expire; | |
48 time_t valid_sec; | |
49 size_t body_start; | |
468 | 50 off_t length; |
464 | 51 } ngx_http_file_cache_node_t; |
52 | |
18 | 53 |
464 | 54 struct ngx_http_cache_s { |
55 ngx_file_t file; | |
56 ngx_array_t keys; | |
57 uint32_t crc32; | |
58 u_char key[NGX_HTTP_CACHE_KEY_LEN]; | |
59 | |
60 ngx_file_uniq_t uniq; | |
61 time_t valid_sec; | |
62 time_t last_modified; | |
63 time_t date; | |
64 | |
65 size_t header_start; | |
66 size_t body_start; | |
67 off_t length; | |
68 | |
69 ngx_uint_t min_uses; | |
70 ngx_uint_t error; | |
71 ngx_uint_t valid_msec; | |
72 | |
73 ngx_buf_t *buf; | |
74 | |
75 ngx_http_file_cache_t *file_cache; | |
76 ngx_http_file_cache_node_t *node; | |
77 | |
78 unsigned updated:1; | |
79 unsigned exists:1; | |
80 unsigned temp_file:1; | |
81 }; | |
0 | 82 |
83 | |
22 | 84 typedef struct { |
464 | 85 time_t valid_sec; |
86 time_t last_modified; | |
87 time_t date; | |
88 uint32_t crc32; | |
89 u_short valid_msec; | |
90 u_short header_start; | |
91 u_short body_start; | |
92 } ngx_http_file_cache_header_t; | |
26 | 93 |
94 | |
480 | 95 typedef struct { |
96 ngx_rbtree_t rbtree; | |
97 ngx_rbtree_node_t sentinel; | |
98 ngx_queue_t queue; | |
99 ngx_atomic_t cold; | |
502 | 100 ngx_atomic_t loading; |
480 | 101 off_t size; |
102 } ngx_http_file_cache_sh_t; | |
103 | |
104 | |
464 | 105 struct ngx_http_file_cache_s { |
480 | 106 ngx_http_file_cache_sh_t *sh; |
464 | 107 ngx_slab_pool_t *shpool; |
18 | 108 |
464 | 109 ngx_path_t *path; |
0 | 110 |
468 | 111 off_t max_size; |
112 size_t bsize; | |
113 | |
464 | 114 time_t inactive; |
468 | 115 |
116 ngx_msec_t last; | |
117 ngx_uint_t files; | |
0 | 118 |
464 | 119 ngx_shm_zone_t *shm_zone; |
120 }; | |
0 | 121 |
122 | |
464 | 123 void ngx_http_file_cache_create_key(ngx_http_request_t *r); |
124 ngx_int_t ngx_http_file_cache_open(ngx_http_request_t *r); | |
125 void ngx_http_file_cache_set_header(ngx_http_request_t *r, u_char *buf); | |
126 void ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf); | |
127 ngx_int_t ngx_http_cache_send(ngx_http_request_t *); | |
128 void ngx_http_file_cache_free(ngx_http_request_t *r, ngx_temp_file_t *tf); | |
129 time_t ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t status); | |
0 | 130 |
464 | 131 char *ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, |
132 void *conf); | |
133 char *ngx_http_file_cache_valid_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, | |
134 void *conf); | |
18 | 135 |
500 | 136 extern ngx_str_t ngx_http_cache_status[]; |
137 | |
0 | 138 |
139 #endif /* _NGX_HTTP_CACHE_H_INCLUDED_ */ |