diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-09-23 18:43:49 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-09-23 18:43:49 +0400 |
commit | 09a24396124e911059c2ca405ba55af96e61ede0 (patch) | |
tree | 29cd04f0fa8a3b367d73882aac5a56211384a428 /src/core | |
parent | b6f62a9a1c4f4416a03963882c8f30f3ccff5d0e (diff) |
nginx-0.2.1-RELEASE importrelease-0.2.1
*) Bugfix: if all backend using in load-balancing failed after one
error, then nginx may got caught in an endless loop; the bug had
appeared in 0.2.0.
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/nginx.h | 2 | ||||
-rw-r--r-- | src/core/ngx_conf_file.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 22927b3c2..6468b9479 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.2.0" +#define NGINX_VER "nginx/0.2.1" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 483852fd2..9f344e64c 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -97,19 +97,20 @@ struct ngx_open_file_s { }; -#define NGX_MODULE_V1 0, 0, 1, 0, 0, 0, 0 +#define NGX_MODULE_V1 0, 0, 0, 0, 0, 0, 1 #define NGX_MODULE_V1_PADDING 0, 0, 0, 0, 0, 0, 0, 0 struct ngx_module_s { ngx_uint_t ctx_index; ngx_uint_t index; - ngx_uint_t version; ngx_uint_t spare0; ngx_uint_t spare1; ngx_uint_t spare2; ngx_uint_t spare3; + ngx_uint_t version; + void *ctx; ngx_command_t *commands; ngx_uint_t type; |