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.

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index fa1342cd5ea3d40bd92cd97b9355f2a43c5699d4..9029f9efff8528b2e31efba4ff5855e303faf7ec 100644 (file)
--- 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">

diff --git a/src/core/nginx.h b/src/core/nginx.h
index e482c424febd6bd586f3e158cc27f123c8c72c57..a52f6c8e49cdf1f08759263373d9e26d8b2c433d 100644 (file)
--- 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 cac39440050710f849e6af8b843b27afb1081349..94f816bffb40c7b18283a2a174b040e5ac57ff01 100644 (file)
--- 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 1c6ab55dc25e86a01b07ba361007f9f2399703b5..d4916792c3662fa055f5c22b5aae99ca9da1c2e0 100644 (file)
--- 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);