Mercurial > hg > nginx
diff src/event/modules/ngx_poll_module.c @ 567:1af2fcb3be8a release-0.3.5
nginx-0.3.5-RELEASE import
*) Bugfix: the segmentation fault may occurred if the IMAP/POP3 login
was changed by authorization server; the bug had appeared in 0.2.2.
*) Bugfix: the accept mutex did not work and all connections were
handled by one process; the bug had appeared in 0.3.3.
*) Bugfix: the timeout did not work if the "rtsig" method and the
"timer_resolution" directive were used.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 21 Oct 2005 19:12:18 +0000 |
parents | 9c2f3ed7a247 |
children | 4d9ea73a627a |
line wrap: on
line diff
--- a/src/event/modules/ngx_poll_module.c Wed Oct 19 13:34:28 2005 +0000 +++ b/src/event/modules/ngx_poll_module.c Fri Oct 21 19:12:18 2005 +0000 @@ -241,7 +241,6 @@ ngx_err_t err; ngx_int_t i, nready; ngx_uint_t found, level; - ngx_msec_t delta; ngx_event_t *ev, **queue; ngx_connection_t *c; @@ -267,8 +266,6 @@ err = 0; } - delta = ngx_current_msec; - if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0); } @@ -294,21 +291,14 @@ return NGX_ERROR; } - if (timer != NGX_TIMER_INFINITE) { - delta = ngx_current_msec - delta; + if (ready == 0) { + if (timer != NGX_TIMER_INFINITE) { + return NGX_OK; + } - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "poll timer: %M, delta: %M", timer, delta); - } else { - if (ready == 0) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, - "poll() returned no events without timeout"); - return NGX_ERROR; - } - } - - if (ready == 0) { - return NGX_OK; + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, + "poll() returned no events without timeout"); + return NGX_ERROR; } ngx_mutex_lock(ngx_posted_events_mutex);