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

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  improve signal globals consistency check for TS
This commit is contained in:
Anatol Belski 2017-03-02 20:34:48 +01:00
commit 1d4248af42
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_signal.c
View file

@ -91,7 +91,7 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
#ifdef ZTS #ifdef ZTS
ZEND_TSRMLS_CACHE_UPDATE(); ZEND_TSRMLS_CACHE_UPDATE();
/* A signal could hit after TSRM shutdown, in this case globals are already freed. */ /* A signal could hit after TSRM shutdown, in this case globals are already freed. */
if (NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) {
is_handling_safe = 0; is_handling_safe = 0;
} }
#endif #endif
@ -181,7 +181,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
sigset_t sigset; sigset_t sigset;
zend_signal_entry_t p_sig; zend_signal_entry_t p_sig;
#ifdef ZTS #ifdef ZTS
if (NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) {
p_sig.flags = 0; p_sig.flags = 0;
p_sig.handler = SIG_DFL; p_sig.handler = SIG_DFL;
} else } else