diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 14:31:55 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 14:31:55 +0000 |
| commit | aa96ac67fc96899551e555cdb616137525bbbb2e (patch) | |
| tree | 8ff364e620ff2b30437035c100b171f751b73089 /src/http/ngx_http_core_module.c | |
| parent | b527aea8d1aed60fea5ed3db0b28f8cf4df37841 (diff) | |
| download | nginx-aa96ac67fc96899551e555cdb616137525bbbb2e.tar.gz nginx-aa96ac67fc96899551e555cdb616137525bbbb2e.tar.bz2 | |
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.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 0739c0044..c1fab3092 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4397,7 +4397,7 @@ ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (ngx_strncmp(value[i].data, "max=", 4) == 0) { max = ngx_atoi(value[i].data + 4, value[i].len - 4); - if (max == NGX_ERROR) { + if (max <= 0) { goto failed; } |