From 73a73b5a60b1c6c985f3e9a5d7cddbe292ad01a4 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 20 Jun 2004 19:54:15 +0000
Subject: nginx-0.0.7-2004-06-20-23:54:15 import

---
 src/event/ngx_event_timer.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/event/ngx_event_timer.c')

diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index a3d4d808d..fb401cf84 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -91,15 +91,7 @@ void ngx_event_expire_timers(ngx_msec_t timer)
 
             ngx_del_timer(ev);
 
-            if (ev->delayed) {
-                ev->delayed = 0;
-                if (ev->ready == 0) {
-                    continue;
-                }
-
-            } else {
-                ev->timedout = 1;
-            }
+            ev->timedout = 1;
 
             if (ngx_threaded) {
                 if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
-- 
cgit v1.2.3