Mercurial > hg > nginx
changeset 565:7c1369d37c7e release-0.3.4
nginx-0.3.4-RELEASE import
*) Bugfix: nginx could not be built on Linux 2.4+ and MacOS X; the bug
had appeared in 0.3.3.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 19 Oct 2005 13:34:28 +0000 |
| parents | 598f66556a42 |
| children | 4fc7c33856a4 |
| files | docs/xml/nginx/changes.xml src/core/nginx.h src/core/ngx_connection.c src/event/modules/ngx_kqueue_module.c |
| diffstat | 4 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -9,6 +9,22 @@ <title lang="en">nginx changelog</title> +<changes ver="0.3.4" date="19.09.2005"> + +<change type="bugfix"> +<para lang="ru"> +nginx не собирался на Linux 2.4+ и MacOS X; +ошибка появилась в 0.3.3. +</para> +<para lang="en"> +nginx could not be built on Linux 2.4+ and MacOS X; +bug appeared in 0.3.3. +</para> +</change> + +</changes> + + <changes ver="0.3.3" date="19.10.2005"> <change type="change">
--- 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"
--- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -198,7 +198,7 @@ ngx_set_inherited_sockets(ngx_cycle_t *c continue; } - if (tlen < sizeof(int) || timeout == 0) { + if (olen < sizeof(int) || timeout == 0) { continue; }
--- 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; + ngx_kqueue_conf_t *kcf; struct timespec ts; - ngx_kqueue_conf_t *kcf; +#if (NGX_HAVE_TIMER_EVENT) + struct kevent kev; +#endif kcf = ngx_event_get_conf(cycle->conf_ctx, ngx_kqueue_module);