[php-src] PHP-8.2: Properly forward the signal to the original handler if TSRM is shutdown. (#10219)
| From: | Bob Weinand via GitHub | Date: | Mon, 18 Mar 2024 19:38:12 +0000 |
| Subject: | [php-src] PHP-8.2: Properly forward the signal to the original handler if TSRM is shutdown. (#10219) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-127786@lists.php.net to get a copy of this message | ||
Author: Bob Weinand (bwoebi)
Committer: GitHub (web-flow)
Pusher: bwoebi
Date: 2024-03-18T20:24:23+01:00
Commit: https://github.com/php/php-src/commit/059bf33e6054d8aab3f42204a85c76da3e5f86de
Raw diff: https://github.com/php/php-src/commit/059bf33e6054d8aab3f42204a85c76da3e5f86de.diff
Properly forward the signal to the original handler if TSRM is shutdown. (#10219)
This ensures proper handling of SIGQUIT in ZTS fpm builds outside of active requests.
Changed paths:
M Zend/zend_signal.c
Diff:
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index 0990999e0116..e32ffeff9c6b 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_get_ls_cache()) {
- p_sig.flags = 0;
- p_sig.handler = SIG_DFL;
+ p_sig = global_orig_handlers[signo-1];
} else
#endif
p_sig = SIGG(handlers)[signo-1];