summaryrefslogtreecommitdiffhomepage
path: root/src/event/ngx_event_timer.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/event/ngx_event_timer.c9
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;
}