Mercurial > hg > nginx-vendor-current

changeset 114:ebca9c35e3a6 NGINX_0_3_4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.4 *) Bugfix: nginx could not be built on Linux 2.4+ and MacOS X; bug appeared in 0.3.3.
author Igor Sysoev <http://sysoev.ru>
date Wed, 19 Oct 2005 00:00:00 +0400
parents 8de269bc477d
children 45a230988aa5
files CHANGES CHANGES.ru src/core/nginx.h src/core/ngx_connection.c src/event/modules/ngx_kqueue_module.c
diffstat 5 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+
+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
 
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,3 +1,9 @@
+
+Изменения в nginx 0.3.4                                           19.09.2005
+
+    *) Исправление: nginx не собирался на Linux 2.4+ и MacOS X; ошибка 
+       появилась в 0.3.3.
+
 
 Изменения в nginx 0.3.3                                           19.10.2005
 
--- 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);