diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:35:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:35:08 +0000 |
| commit | e66eb15b7be2534c9405900eb7350b538a146905 (patch) | |
| tree | 9fdde42dc4d05ce8b264225ba9c13ced6b3d8310 /src/event/modules/ngx_epoll_module.c | |
| parent | ea3aaae636eb194e3dbbc5b9d0c0a51d831e2d4c (diff) | |
| download | nginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.gz nginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.bz2 | |
merge r3473, r3474, r3385, r3386, r3537:
signal processing stability:
*) use sys_errlist[] in signal handler instead
of non Async-Signal-Safe strerror_r()
*) do not update time in the timer signal handler,
since localtime_r() is not Async-Signal-Safe function
*) use previously cached GMT offset value to update time from a signal handler
*) change ngx_time_update() interface since there are no notification methods
those return time
*) introduce ngx_time_sigsafe_update() to update the error log time only
*) change ngx_time_update() interface
Diffstat (limited to 'src/event/modules/ngx_epoll_module.c')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index b3267b37d..1a7215fb4 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -407,8 +407,8 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) err = 0; } - if (flags & NGX_UPDATE_TIME) { - ngx_time_update(0, 0); + if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { + ngx_time_update(); } if (err) { |