summaryrefslogtreecommitdiffhomepage
path: root/src/http
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-06-07 10:35:08 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-06-07 10:35:08 +0000
commite66eb15b7be2534c9405900eb7350b538a146905 (patch)
tree9fdde42dc4d05ce8b264225ba9c13ced6b3d8310 /src/http
parentea3aaae636eb194e3dbbc5b9d0c0a51d831e2d4c (diff)
downloadnginx-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/http')
-rw-r--r--src/http/ngx_http_file_cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index c02bc7740..d5d6112a2 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1128,7 +1128,7 @@ ngx_http_file_cache_manager_sleep(ngx_http_file_cache_t *cache)
if (cache->files++ > 100) {
- ngx_time_update(0, 0);
+ ngx_time_update();
elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
@@ -1145,7 +1145,7 @@ ngx_http_file_cache_manager_sleep(ngx_http_file_cache_t *cache)
ngx_msleep(200);
- ngx_time_update(0, 0);
+ ngx_time_update();
}
cache->last = ngx_current_msec;