archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Properly forward the signal to the original handler if TSRM is shutdown. (#10219)

Browse source 
This ensures proper handling of SIGQUIT in ZTS fpm builds outside of active requests.
This commit is contained in:
Bob Weinand 2024-03-18 20:24:23 +01:00 • committed by GitHub
parent 10d912d6e3
commit 059bf33e60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_signal.c
View file

@ -183,8 +183,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
zend_signal_entry_t p_sig; zend_signal_entry_t p_sig;
#ifdef ZTS #ifdef ZTS
if (tsrm_is_shutdown() || !tsrm_get_ls_cache()) { if (tsrm_is_shutdown() || !tsrm_get_ls_cache()) {
p_sig.flags = 0; p_sig = global_orig_handlers[signo-1];
p_sig.handler = SIG_DFL;
} else } else
#endif #endif
p_sig = SIGG(handlers)[signo-1]; p_sig = SIGG(handlers)[signo-1];