diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2017-11-28 12:00:24 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2017-11-28 12:00:24 +0300 |
| commit | afad21917584e9b452ba33ce3485edde5615b859 (patch) | |
| tree | 883222e33a8203c4023017f7536b040c48a881cb /src/os/unix/ngx_process.h | |
| parent | 7a7fc708fb7f6739dc6652ee1f14da1f9e24650d (diff) | |
| download | nginx-afad21917584e9b452ba33ce3485edde5615b859.tar.gz nginx-afad21917584e9b452ba33ce3485edde5615b859.zip | |
Fixed "changing binary" when reaper is not init.
On some systems, it's possible that reaper of orphaned processes is
set to something other than "init" process. On such systems, the
changing binary procedure did not work.
The fix is to check if PPID has changed, instead of assuming it's
always 1 for orphaned processes.
Diffstat (limited to 'src/os/unix/ngx_process.h')
| -rw-r--r-- | src/os/unix/ngx_process.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h index 7b5e8c0c2..3986639b4 100644 --- a/src/os/unix/ngx_process.h +++ b/src/os/unix/ngx_process.h @@ -54,6 +54,7 @@ typedef struct { #define ngx_getpid getpid +#define ngx_getppid getppid #ifndef ngx_log_pid #define ngx_log_pid ngx_pid @@ -79,6 +80,7 @@ extern char **ngx_argv; extern char **ngx_os_argv; extern ngx_pid_t ngx_pid; +extern ngx_pid_t ngx_parent; extern ngx_socket_t ngx_channel; extern ngx_int_t ngx_process_slot; extern ngx_int_t ngx_last_process; |