do not update time in the timer signal handler, since localtime_r() is not Async-Signal-Safe function
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c index 3dd2230..f133b72 100644 --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c
@@ -371,7 +371,7 @@ err = (events == -1) ? ngx_errno : 0; - if (flags & NGX_UPDATE_TIME) { + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { ngx_time_update(0, 0); }
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index dc5d422..3c1ca2a 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c
@@ -531,7 +531,7 @@ err = (events == -1) ? ngx_errno : 0; - if (flags & NGX_UPDATE_TIME) { + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { ngx_time_update(0, 0); }
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 02230ca..b6dfa8f 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c
@@ -537,7 +537,7 @@ err = (events == -1) ? ngx_errno : 0; - if (flags & NGX_UPDATE_TIME) { + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { ngx_time_update(0, 0); }
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index 10098d6..3b98c19 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c
@@ -262,7 +262,7 @@ err = (ready == -1) ? ngx_errno : 0; - if (flags & NGX_UPDATE_TIME) { + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { ngx_time_update(0, 0); }
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index e76da5b..9f5b43b 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c
@@ -262,7 +262,7 @@ err = (ready == -1) ? ngx_errno : 0; - if (flags & NGX_UPDATE_TIME) { + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { ngx_time_update(0, 0); }
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 9c13eac..3922b0e 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c
@@ -562,8 +562,6 @@ { ngx_event_timer_alarm = 1; - ngx_time_update(0, 0); - #if 1 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, "timer signal"); #endif