Mercurial > hg > nginx

diff src/event/modules/ngx_epoll_module.c @ 3473:0299cf5856fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not update time in the timer signal handler, since localtime_r() is not Async-Signal-Safe function
author Igor Sysoev <igor@sysoev.ru>
date Fri, 12 Mar 2010 14:31:47 +0000
parents 6060225e9261
children d4c4cfdffe30
line wrap: on
line diff
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -531,7 +531,7 @@ ngx_epoll_process_events(ngx_cycle_t *cy
 
     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);
     }