comparison src/http/ngx_http_core_module.c @ 4357:efd515ace6bb stable-1.0

Merge of r4270, r4274: Minor cleanup: *) Changed error message to be more appropriate in the imaginary "open_file_cache max=0" case. *) Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Dec 2011 14:31:55 +0000
parents c8695c991cb8
children 2d235c76c59e
comparison
equal deleted inserted replaced
4356:c8695c991cb8 4357:efd515ace6bb
4395 for (i = 1; i < cf->args->nelts; i++) { 4395 for (i = 1; i < cf->args->nelts; i++) {
4396 4396
4397 if (ngx_strncmp(value[i].data, "max=", 4) == 0) { 4397 if (ngx_strncmp(value[i].data, "max=", 4) == 0) {
4398 4398
4399 max = ngx_atoi(value[i].data + 4, value[i].len - 4); 4399 max = ngx_atoi(value[i].data + 4, value[i].len - 4);
4400 if (max == NGX_ERROR) { 4400 if (max <= 0) {
4401 goto failed; 4401 goto failed;
4402 } 4402 }
4403 4403
4404 continue; 4404 continue;
4405 } 4405 }