diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-02 05:47:00 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-02 05:47:00 +0000 |
| commit | 46cd7c2a9bc740a2d3de03410dd84412b9d85856 (patch) | |
| tree | a292c6b96f130845150ebf013011bece87f38cb9 /src/event/ngx_event_timer.c | |
| parent | 078d1b2c2263690f2f6b7217b567eeeb525910d0 (diff) | |
| download | nginx-46cd7c2a9bc740a2d3de03410dd84412b9d85856.tar.gz nginx-46cd7c2a9bc740a2d3de03410dd84412b9d85856.tar.bz2 | |
nginx-0.0.7-2004-07-02-09:47:00 import
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event_timer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 893b2a9e1..c10e23069 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -110,25 +110,26 @@ void ngx_event_expire_timers(ngx_msec_t timer) #endif ev->timer_set = 0; - ev->timedout = 1; -#if (NGX_THREADS) - ngx_unlock(ev->lock); -#endif if (ngx_threaded) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { return; } + ev->posted_timedout = 1; ngx_post_event(ev); ngx_mutex_unlock(ngx_posted_events_mutex); continue; } + ev->timedout = 1; + ev->event_handler(ev); + continue; } + break; } |