From 4cec79fb6a3138aeeee400b9c32f23a22cf2dac8 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 28 Apr 2004 06:14:50 +0000 Subject: nginx-0.0.3-2004-04-28-10:14:50 import --- src/event/modules/ngx_epoll_module.c | 3 ++- src/event/modules/ngx_rtsig_module.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/event/modules') diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index a1d708475..a8e51c646 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -172,6 +172,7 @@ static int ngx_epoll_init(ngx_cycle_t *cycle) #else ngx_event_flags = NGX_USE_LEVEL_EVENT #endif + |NGX_HAVE_GREEDY_EVENT |NGX_HAVE_INSTANCE_EVENT; return NGX_OK; @@ -472,7 +473,7 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) continue; } -#if (NGX_DEBUG) +#if (NGX_DEBUG0) log = c->log ? c->log : cycle->log; #endif diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c index e5f632a2a..af5d77294 100644 --- a/src/event/modules/ngx_rtsig_module.c +++ b/src/event/modules/ngx_rtsig_module.c @@ -117,7 +117,9 @@ static int ngx_rtsig_init(ngx_cycle_t *cycle) ngx_event_actions = ngx_rtsig_module_ctx.actions; - ngx_event_flags = NGX_USE_SIGIO_EVENT|NGX_HAVE_INSTANCE_EVENT; + ngx_event_flags = NGX_USE_SIGIO_EVENT + |NGX_HAVE_GREEDY_EVENT + |NGX_HAVE_INSTANCE_EVENT; return NGX_OK; } -- cgit