Mercurial > hg > nginx

comparison src/http/ngx_http_file_cache.c @ 6617:8bf484eef9ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use NGX_MAX_PATH_LEVEL where appropriate. The macro was unused since 0.7.44.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 06 Jul 2016 13:22:29 +0300
parents d94f57990492
children ca709bca4b77
comparison
equal deleted inserted replaced
6616:82b0cd4a0324 6617:8bf484eef9ab
99 &ocache->path->name); 99 &ocache->path->name);
100 100
101 return NGX_ERROR; 101 return NGX_ERROR;
102 } 102 }
103 103
104 for (n = 0; n < 3; n++) { 104 for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) {
105 if (cache->path->level[n] != ocache->path->level[n]) { 105 if (cache->path->level[n] != ocache->path->level[n]) {
106 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0, 106 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
107 "cache \"%V\" had previously different levels", 107 "cache \"%V\" had previously different levels",
108 &shm_zone->shm.name); 108 &shm_zone->shm.name);
109 return NGX_ERROR; 109 return NGX_ERROR;
2255 if (ngx_strncmp(value[i].data, "levels=", 7) == 0) { 2255 if (ngx_strncmp(value[i].data, "levels=", 7) == 0) {
2256 2256
2257 p = value[i].data + 7; 2257 p = value[i].data + 7;
2258 last = value[i].data + value[i].len; 2258 last = value[i].data + value[i].len;
2259 2259
2260 for (n = 0; n < 3 && p < last; n++) { 2260 for (n = 0; n < NGX_MAX_PATH_LEVEL && p < last; n++) {
2261 2261
2262 if (*p > '0' && *p < '3') { 2262 if (*p > '0' && *p < '3') {
2263 2263
2264 cache->path->level[n] = *p++ - '0'; 2264 cache->path->level[n] = *p++ - '0';
2265 cache->path->len += cache->path->level[n] + 1; 2265 cache->path->len += cache->path->level[n] + 1;
2266 2266
2267 if (p == last) { 2267 if (p == last) {
2268 break; 2268 break;
2269 } 2269 }
2270 2270
2271 if (*p++ == ':' && n < 2 && p != last) { 2271 if (*p++ == ':' && n < NGX_MAX_PATH_LEVEL - 1 && p < last) {
2272 continue; 2272 continue;
2273 } 2273 }
2274 2274
2275 goto invalid_levels; 2275 goto invalid_levels;
2276 } 2276 }
2277 2277
2278 goto invalid_levels; 2278 goto invalid_levels;
2279 } 2279 }
2280 2280
2281 if (cache->path->len < 10 + 3) { 2281 if (cache->path->len < 10 + NGX_MAX_PATH_LEVEL) {
2282 continue; 2282 continue;
2283 } 2283 }
2284 2284
2285 invalid_levels: 2285 invalid_levels:
2286 2286
2448 2448
2449 p = ngx_cpymem(p, cache->path->name.data, cache->path->name.len); 2449 p = ngx_cpymem(p, cache->path->name.data, cache->path->name.len);
2450 ngx_memcpy(p, "/temp", sizeof("/temp")); 2450 ngx_memcpy(p, "/temp", sizeof("/temp"));
2451 2451
2452 ngx_memcpy(&cache->temp_path->level, &cache->path->level, 2452 ngx_memcpy(&cache->temp_path->level, &cache->path->level,
2453 3 * sizeof(size_t)); 2453 NGX_MAX_PATH_LEVEL * sizeof(size_t));
2454 2454
2455 cache->temp_path->len = cache->path->len; 2455 cache->temp_path->len = cache->path->len;
2456 cache->temp_path->conf_file = cf->conf_file->file.name.data; 2456 cache->temp_path->conf_file = cf->conf_file->file.name.data;
2457 cache->temp_path->line = cf->conf_file->line; 2457 cache->temp_path->line = cf->conf_file->line;
2458 2458