diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 10:10:22 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 10:10:22 +0100 |
commit | 97dd1591af3eee8ff43f77afc03013a29cdeb935 (patch) | |
tree | 9164de1b1eb01689915ad68f65bd8f7776003c3d /ext/pcntl/pcntl.c | |
parent | 8ed775f548d2535b87ff439f0b0a04b7770ed914 (diff) | |
parent | b5cb3ac8ecab71bfe1eb7d5b2d7a48970e11a5b4 (diff) | |
download | php-git-97dd1591af3eee8ff43f77afc03013a29cdeb935.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/pcntl/pcntl.c')
-rw-r--r-- | ext/pcntl/pcntl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index b243b22027..c6236f9663 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1273,6 +1273,12 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi break; #endif } +#if defined(SIGRTMIN) && defined(SIGRTMAX) + if (SIGRTMIN <= signo && signo <= SIGRTMAX) { + add_assoc_long_ex(user_siginfo, "pid", sizeof("pid")-1, siginfo->si_pid); + add_assoc_long_ex(user_siginfo, "uid", sizeof("uid")-1, siginfo->si_uid); + } +#endif } } /* }}} */ |