diff options
Diffstat (limited to 'src')
| -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 |
3 files changed, 6 insertions, 4 deletions
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); |