diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:36:02 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:36:02 +0300 |
| commit | dbb462db5d55d77dcc63237e4e33e315bd2cbd4d (patch) | |
| tree | babfe7d537e8eea0cecac5eaa6f31ca332ea3ebc /Zend/zend_signal.c | |
| parent | 59e954524efc57a5e45565d255d45577e0e32215 (diff) | |
| parent | 04b67bac32e5fbc0942a1e15405fa1ca7f0438fe (diff) | |
| download | php-git-dbb462db5d55d77dcc63237e4e33e315bd2cbd4d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
Diffstat (limited to 'Zend/zend_signal.c')
| -rw-r--r-- | Zend/zend_signal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index d5146b6dec..a0dccd5819 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -87,7 +87,6 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context) zend_bool is_handling_safe = 1; #ifdef ZTS - ZEND_TSRMLS_CACHE_UPDATE(); /* A signal could hit after TSRM shutdown, in this case globals are already freed. */ if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { is_handling_safe = 0; |