diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 11:31:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 11:31:20 +0000 |
| commit | 14d92237d13a4d28251e75619946279df4a19cc9 (patch) | |
| tree | 5fc9882161d0930868e7b2464b4863aca4008736 /src/os/unix/ngx_process.c | |
| parent | bfa9302e8976db62f6628a255016314f450b5e5b (diff) | |
| download | nginx-14d92237d13a4d28251e75619946279df4a19cc9.tar.gz nginx-14d92237d13a4d28251e75619946279df4a19cc9.tar.bz2 | |
merge r3047, r3048, r3049:
twice termination delay only after SIGALRM, otherwise many separate SIGCHLD
and SIGIO signals quickly increase delay to the level when SIGKILL is sent
Diffstat (limited to 'src/os/unix/ngx_process.c')
| -rw-r--r-- | src/os/unix/ngx_process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 7446c138b..c480d6899 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -359,6 +359,7 @@ ngx_signal_handler(int signo) break; case SIGALRM: + ngx_sigalrm = 1; break; case SIGIO: |