]> git.kaiwu.me - nginx.git/commitdiff
fix cache path slot
authorIgor Sysoev <igor@sysoev.ru>
Mon, 6 Apr 2009 08:35:34 +0000 (08:35 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 6 Apr 2009 08:35:34 +0000 (08:35 +0000)
src/http/ngx_http_file_cache.c

index d000a9d14ac3c886eda40f664544fcb11290ec81..005c597797a18ff12a47f74abe887d9e76e013d6 100644 (file)
@@ -1357,13 +1357,12 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
         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 *cf, ngx_command_t *cmd, void *conf)
                         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;