summaryrefslogtreecommitdiffhomepage
path: root/src/event/ngx_event_timer.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2003-04-17 17:59:35 +0000
committerIgor Sysoev <igor@sysoev.ru>2003-04-17 17:59:35 +0000
commit6a7fd11170b5e8f62f67c739da6d83470f5407fd (patch)
treeb6180f27545dff757fa3506b29ba029bbb00eb80 /src/event/ngx_event_timer.c
parent153d743b071263686878c7a72b313a060cd2b9d8 (diff)
downloadnginx-6a7fd11170b5e8f62f67c739da6d83470f5407fd.tar.gz
nginx-6a7fd11170b5e8f62f67c739da6d83470f5407fd.tar.bz2
nginx-0.0.1-2003-04-17-21:59:35 import
Diffstat (limited to 'src/event/ngx_event_timer.c')
-rw-r--r--src/event/ngx_event_timer.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index e20839d9e..aebbaf839 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -129,7 +129,15 @@ void ngx_event_expire_timers(ngx_msec_t timer)
delta -= ev->timer_delta;
ngx_del_timer(ev);
- ev->timedout = 1;
+ if (ev->delayed) {
+ ev->delayed = 0;
+ if (ev->ready == 0) {
+ continue;
+ }
+
+ } else {
+ ev->timedout = 1;
+ }
if (ev->event_handler(ev) == NGX_ERROR) {
ev->close_handler(ev);