diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-07 16:15:44 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-07 16:15:44 +0800 |
| commit | f16bb1be51019ece58552ee787f9def6ccee2519 (patch) | |
| tree | 02672d20b281ba0d4381569d40c0263b9c0cd0ad /Zend | |
| parent | 36848f6e0888bca3b27634e11f58f705328cab44 (diff) | |
| parent | 7a796d18eefcc62a83199adb9db92913172f81b6 (diff) | |
| download | php-git-f16bb1be51019ece58552ee787f9def6ccee2519.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74353 (Segfault when killing within bash script trap code)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index e067c518e8..368ad7b5b3 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -210,7 +210,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context) #endif } } - } else { + } else if (p_sig.handler != SIG_IGN) { if (p_sig.flags & SA_SIGINFO) { if (p_sig.flags & SA_RESETHAND) { SIGG(handlers)[signo-1].flags = 0; |