diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 4d27a875f..dc1e14337 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.1.29" +#define NGINX_VER "nginx/0.1.30" #define NGINX_VAR "NGINX" #define NGX_NEWPID_EXT ".newbin" diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index b9b2200bf..42143bd2c 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -263,7 +263,7 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last) valid = 0; } - } else if (cf->args->nelts <= 10 + } else if (cf->args->nelts <= NGX_CONF_MAX_ARGS && (cmd->type & argument_number[cf->args->nelts - 1])) { diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 899f046e8..1f4e72cee 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -27,6 +27,8 @@ #define NGX_CONF_TAKE6 0x00000040 #define NGX_CONF_TAKE7 0x00000080 +#define NGX_CONF_MAX_ARGS 8 + #define NGX_CONF_TAKE12 (NGX_CONF_TAKE1|NGX_CONF_TAKE2) #define NGX_CONF_TAKE13 (NGX_CONF_TAKE1|NGX_CONF_TAKE3) |