Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_file_cache.c @ 626:a7a5fa2e395b NGINX_1_0_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.3 *) Feature: the "auth_basic_user_file" directive supports "$apr1", "{PLAIN}", and "{SSHA}" password encryption methods. Thanks to Maxim Dounin. *) Feature: the "geoip_org" directive and $geoip_org variable. Thanks to Alexander Uskov, Arnaud Granal, and Denis F. Latypoff. *) Feature: ngx_http_geo_module and ngx_http_geoip_module support IPv4 addresses mapped to IPv6 addresses. *) Bugfix: a segmentation fault occurred in a worker process during testing IPv4 address mapped to IPv6 address, if access or deny rules were defined only for IPv6; the bug had appeared in 0.8.22. *) Bugfix: a cached reponse may be broken if proxy/fastcgi/scgi/ uwsgi_cache_bypass and proxy/fastcgi/scgi/uwsgi_no_cache directive values were different; the bug had appeared in 0.8.46.
author Igor Sysoev <http://sysoev.ru>
date Wed, 25 May 2011 00:00:00 +0400
parents 8dc007eddbcf
children ad6fee8052d7
comparison
equal deleted inserted replaced
625:30f948276abe 626:a7a5fa2e395b
172 { 172 {
173 ngx_http_cache_t *c; 173 ngx_http_cache_t *c;
174 ngx_pool_cleanup_t *cln; 174 ngx_pool_cleanup_t *cln;
175 ngx_http_file_cache_t *cache; 175 ngx_http_file_cache_t *cache;
176 176
177 ngx_http_file_cache_create_key(r);
178
179 c = r->cache; 177 c = r->cache;
180 cache = c->file_cache; 178 cache = c->file_cache;
181 179
182 cln = ngx_pool_cleanup_add(r->pool, 0); 180 cln = ngx_pool_cleanup_add(r->pool, 0);
183 if (cln == NULL) { 181 if (cln == NULL) {
904 ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf) 902 ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf)
905 { 903 {
906 ngx_http_file_cache_t *cache; 904 ngx_http_file_cache_t *cache;
907 ngx_http_file_cache_node_t *fcn; 905 ngx_http_file_cache_node_t *fcn;
908 906
909 if (c->updated) { 907 if (c->updated || c->node == NULL) {
910 return; 908 return;
911 } 909 }
912 910
913 cache = c->file_cache; 911 cache = c->file_cache;
914 912