diff options
author | Valentin Bartenev <vbart@nginx.com> | 2014-08-13 22:45:04 +0400 |
---|---|---|
committer | Valentin Bartenev <vbart@nginx.com> | 2014-08-13 22:45:04 +0400 |
commit | 8b30fb7c9771e24543f7fcc82431a4741f6e9d48 (patch) | |
tree | 69f8e8934be7aaffabad7b9a41693e6a5a87f63d /src/os/unix/ngx_process_cycle.c | |
parent | 16403bc7b1af41433bfcd1bda4db8216b57e0810 (diff) | |
download | nginx-8b30fb7c9771e24543f7fcc82431a4741f6e9d48.tar.gz nginx-8b30fb7c9771e24543f7fcc82431a4741f6e9d48.zip |
Events: introduced cancelable timers.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 196394488..51cf72544 100644 --- 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 *cycle, void *data) } } + 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"); |