diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 13:32:48 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2005-10-19 13:32:48 +0000 |
| commit | 4076d7a784b89cc81c11731f2c880820880dacab (patch) | |
| tree | e4412eb2a4379fb2c2272c9f455301a118a0da89 | |
| parent | af6d70029e4495577aa0a6d86e6369e5c7287412 (diff) | |
| download | nginx-4076d7a784b89cc81c11731f2c880820880dacab.tar.gz | |
Changes with nginx 0.3.4 19 Sep 2005v0.3.4
*) Bugfix: nginx could not be built on Linux 2.4+ and MacOS X; bug
appeared in 0.3.3.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_connection.c | 2 | ||||
| -rw-r--r-- | src/event/modules/ngx_kqueue_module.c | 6 |
5 files changed, 18 insertions, 4 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.3.4 19 Sep 2005 + + *) Bugfix: nginx could not be built on Linux 2.4+ and MacOS X; bug + appeared in 0.3.3. + + Changes with nginx 0.3.3 19 Oct 2005 *) Change: the "bl" and "af" parameters of the "listen" directive was diff --git a/CHANGES.ru b/CHANGES.ru index 10a156d52..8d0b0a00b 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.3.4 19.09.2005 + + *) Исправление: nginx не собирался на Linux 2.4+ и MacOS X; ошибка + появилась в 0.3.3. + + Изменения в nginx 0.3.3 19.10.2005 *) Изменение: параметры "bl" и "af" директивы listen переименованы в diff --git a/src/core/nginx.h b/src/core/nginx.h index e482c424f..a52f6c8e4 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.3" +#define NGINX_VER "nginx/0.3.4" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index cac394400..94f816bff 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -198,7 +198,7 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle) continue; } - if (tlen < sizeof(int) || timeout == 0) { + if (olen < sizeof(int) || timeout == 0) { continue; } diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 1c6ab55dc..d4916792c 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -114,9 +114,11 @@ ngx_module_t ngx_kqueue_module = { static ngx_int_t ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer) { - struct kevent kev; - struct timespec ts; ngx_kqueue_conf_t *kcf; + struct timespec ts; +#if (NGX_HAVE_TIMER_EVENT) + struct kevent kev; +#endif kcf = ngx_event_get_conf(cycle->conf_ctx, ngx_kqueue_module); |