[php-src] master: Merge branch 'PHP-8.3'
| From: | Bob Weinand | Date: | Mon, 18 Mar 2024 19:40:20 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.3' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127788@lists.php.net to get a copy of this message | ||
Author: Bob Weinand (bwoebi)
Date: 2024-03-18T20:26:24+01:00
Commit: https://github.com/php/php-src/commit/4e934d789e6591ce6e4edebabecbe37605d577ea
Raw diff: https://github.com/php/php-src/commit/4e934d789e6591ce6e4edebabecbe37605d577ea.diff
Merge branch 'PHP-8.3'
Changed paths:
M Zend/zend_signal.c
Diff:
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index f6ca3f40a3e5..2b7f6f173c1f 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -183,8 +183,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
zend_signal_entry_t p_sig;
#ifdef ZTS
if (tsrm_is_shutdown() || !tsrm_is_managed_thread()) {
- p_sig.flags = 0;
- p_sig.handler = SIG_DFL;
+ p_sig = global_orig_handlers[signo-1];
} else
#endif
p_sig = SIGG(handlers)[signo-1];