diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-14 17:44:28 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-14 17:44:28 +0000 |
| commit | b3968b314f063c42f983ba70becfb9fae97651f0 (patch) | |
| tree | 49334a35d59b4491c62facced5f0bdef1e434343 /src/event/modules/ngx_epoll_module.c | |
| parent | a3677248993cddbf6f406dccd313eda8759724fb (diff) | |
| download | nginx-b3968b314f063c42f983ba70becfb9fae97651f0.tar.gz nginx-b3968b314f063c42f983ba70becfb9fae97651f0.tar.bz2 | |
nginx-0.0.3-2004-04-14-21:44:28 import
Diffstat (limited to 'src/event/modules/ngx_epoll_module.c')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index 4b76f86cf..cad7ed9b7 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -356,7 +356,11 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) timer = ngx_event_find_timer(); ngx_old_elapsed_msec = ngx_elapsed_msec; - if (timer == 0) { + if (timer == -1) { + timer = 0; + expire = 1; + + } else if (timer == 0) { timer = (ngx_msec_t) -1; expire = 0; @@ -369,7 +373,9 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) return NGX_ERROR; } - if (ngx_accept_mutex_held == 0 && timer > ngx_accept_mutex_delay) { + if (ngx_accept_mutex_held == 0 + && (timer == -1 || timer > ngx_accept_mutex_delay)) + { timer = ngx_accept_mutex_delay; expire = 0; } |