archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into preload

Browse source 
* master:
  Don't wrap php_module_shutdown() with zend_try. executor_globals are released in ZTS build, and this leads to crash.
  [ci skip] Fix indentation in UPGRADING.
This commit is contained in:
Dmitry Stogov 2018-10-25 23:43:25 +03:00
commit e6b76ecb4b
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/phpdbg/phpdbg.c
View file

@ -2157,9 +2157,7 @@ phpdbg_out:
zend_hash_destroy(&PHPDBG_G(file_sources)); zend_hash_destroy(&PHPDBG_G(file_sources));
zend_try { php_module_shutdown();
php_module_shutdown();
} zend_end_try();
#ifndef _WIN32 #ifndef _WIN32
/* force override (no zend_signals) to prevent crashes due to signal recursion in SIGSEGV/SIGBUS handlers */ /* force override (no zend_signals) to prevent crashes due to signal recursion in SIGSEGV/SIGBUS handlers */