Mercurial > hg > nginx

diff src/os/unix/ngx_process_cycle.c @ 5896:3efdd7788bb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: introduced cancelable timers.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 13 Aug 2014 22:45:04 +0400
parents 1f513d7f1b45
children 457ec43dd8d5
line wrap: on
line diff
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -809,6 +809,8 @@ ngx_worker_process_cycle(ngx_cycle_t *cy
                 }
             }
 
+            ngx_event_cancel_timers();
+
             if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
             {
                 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");