4 files changed, 3 insertions, 26 deletions
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 08aff29e1..583d08c6b 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -165,10 +165,6 @@ ngx_log_debug(cycle->log, "EV: %d" _ dpcf->events);
 
     nevents = dpcf->events;
 
-    if (ngx_event_timer_init(cycle) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     ngx_io = ngx_os_io;
 
     ngx_event_actions = ngx_devpoll_module_ctx.actions;
@@ -188,8 +184,6 @@ static void ngx_devpoll_done(ngx_cycle_t *cycle)
 
     dp = -1;
 
-    ngx_event_timer_done(cycle);
-
     ngx_free(change_list);
     ngx_free(event_list);
     ngx_free(change_index);
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 4a766bf6e..4b35aab68 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2003 Igor Sysoev, http://sysoev.ru/en/
+ * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
  */
 
 
@@ -142,10 +142,6 @@ static int ngx_kqueue_init(ngx_cycle_t *cycle)
 
     nevents = kcf->events;
 
-    if (ngx_event_timer_init(cycle) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     ngx_io = ngx_os_io;
 
     ngx_event_actions = ngx_kqueue_module_ctx.actions;
@@ -174,8 +170,6 @@ static void ngx_kqueue_done(ngx_cycle_t *cycle)
 
     ngx_kqueue = -1;
 
-    ngx_event_timer_done(cycle);
-
     ngx_free(change_list);
     ngx_free(event_list);
 
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 7c1c5fdf7..7b69de50b 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -101,10 +101,6 @@ static int ngx_poll_init(ngx_cycle_t *cycle)
                       NGX_ERROR);
     }
 
-    if (ngx_event_timer_init(cycle) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     ngx_io = ngx_os_io;
 
     ngx_event_actions = ngx_poll_module_ctx.actions;
@@ -117,8 +113,6 @@ static int ngx_poll_init(ngx_cycle_t *cycle)
 
 static void ngx_poll_done(ngx_cycle_t *cycle)
 {
-    ngx_event_timer_done(cycle);
-
     ngx_free(event_list);
     ngx_free(event_index);
     ngx_free(ready_index);
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 4c87f20a5..66783e7e4 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2002-2003 Igor Sysoev, http://sysoev.ru
+ * Copyright (C) 2002-2004 Igor Sysoev, http://sysoev.ru/en/
  */
 
 
@@ -100,10 +100,6 @@ static int ngx_select_init(ngx_cycle_t *cycle)
                       NGX_ERROR);
     }
 
-    if (ngx_event_timer_init(cycle) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     ngx_io = ngx_os_io;
 
     ngx_event_actions = ngx_select_module_ctx.actions;
@@ -122,8 +118,6 @@ static int ngx_select_init(ngx_cycle_t *cycle)
 
 static void ngx_select_done(ngx_cycle_t *cycle)
 {
-    ngx_event_timer_done(cycle);
-
     ngx_free(event_index);
     ngx_free(ready_index);
 
@@ -262,6 +256,7 @@ static int ngx_select_process_events(ngx_log_t *log)
     work_write_fd_set = master_write_fd_set;
 
     timer = ngx_event_find_timer();
+    ngx_old_elapsed_msec = ngx_elapsed_msec;
 
     if (timer) {
 #if (HAVE_SELECT_CHANGE_TIMEOUT)