Mercurial > hg > nginx-quic
changeset 2671:627dee566f6c
fix cache path slot
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 06 Apr 2009 08:35:34 +0000 |
parents | 20a655d8a1f8 |
children | b212066acf50 |
files | src/http/ngx_http_file_cache.c |
diffstat | 1 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -1357,13 +1357,12 @@ ngx_http_file_cache_set_slot(ngx_conf_t if (ngx_strncmp(value[i].data, "levels=", 7) == 0) { - n = 0; p = value[i].data + 7; last = value[i].data + value[i].len; - while (p < last) { + for (n = 0; n < 3 && p < last; n++) { - if (*p > '0' && *p < '6') { + if (*p > '0' && *p < '3') { cache->path->level[n] = *p++ - '0'; cache->path->len += cache->path->level[n] + 1; @@ -1372,20 +1371,11 @@ ngx_http_file_cache_set_slot(ngx_conf_t break; } - if (*p++ == ':') { - - if (n > 2) { - goto invalid_levels; - } - - if (cache->path->level[n] == 0) { - goto invalid_levels; - } - - n++; - + if (*p++ == ':' && n < 2 && p != last) { continue; } + + goto invalid_levels; } goto invalid_levels;