diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-05-14 22:42:03 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-14 22:42:03 +0400 |
| commit | 3362b8df048ad32b6dd286b37e792f661bb894ea (patch) | |
| tree | 4d34588122fdddf2213a44afac03f9100228990d /src/core | |
| parent | a599375d3b5ae261d30d292a5eb7939623f6e4b1 (diff) | |
nginx-0.1.30-RELEASE importrelease-0.1.30
*) Bugfix: the worker process may got caught in an endless loop if the
SSI was used.
*) Bugfix: the response encrypted by SSL may not transferred complete.
*) Bugfix: if the length of the response part received at once from
proxied or FastCGI server was equal to 500, then nginx returns the
500 response code; in proxy mode the the bug had appeared in 0.1.29
only.
*) Bugfix: nginx did not consider the directives with 8 or 9 parameters
as invalid.
*) Feature: the "return" directive can return the 204 response code.
*) Feature: the "ignore_invalid_headers" directive.
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) |