From bca0a7e2850e50c965ac2e6cb9065e978ac5a9e2 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 25 Oct 2018 11:55:43 -0700 Subject: [PATCH 1/2] [ci skip] Fix indentation in UPGRADING. --- UPGRADING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING b/UPGRADING index cbc231a5897..369e194cb0d 100644 --- a/UPGRADING +++ b/UPGRADING @@ -22,7 +22,7 @@ PHP 7.3 UPGRADE NOTES Core: . The ext_skel utility has been completely redesigned with new options and some old options removed. This is now written in PHP and has no external - dependencies. + dependencies. . Support for BeOS has been dropped. . Exceptions thrown due to automatic conversion of warnings into exceptions in EH_THROW mode (e.g. some DateTime exceptions) no longer populate From 10abc1f010b775d9f21060c5041d34c25f14a2a1 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 25 Oct 2018 23:41:26 +0300 Subject: [PATCH 2/2] Don't wrap php_module_shutdown() with zend_try. executor_globals are released in ZTS build, and this leads to crash. --- sapi/phpdbg/phpdbg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index d5fd81ea6cb..7836f1e3517 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -2157,9 +2157,7 @@ phpdbg_out: zend_hash_destroy(&PHPDBG_G(file_sources)); - zend_try { - php_module_shutdown(); - } zend_end_try(); + php_module_shutdown(); #ifndef _WIN32 /* force override (no zend_signals) to prevent crashes due to signal recursion in SIGSEGV/SIGBUS handlers */