Fixed bug #34725 (CLI segmentation faults during cleanup in ZTS if ext/pcre is DSO)

diff --git a/NEWS b/NEWS
index 8098fe181e17ba23fbc8e405d8d078d1218a7923..f18a22509c614fd2675a20be8b5dfb9dc620e27d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ PHP                                                                        NEWS
 - Fixed bug #34782 (token_get_all() gives wrong result). (Dmitry)
 - Fixed bug #34767 (Zend Engine 1 Compatibility not copying objects correctly).
   (Dmitry)
+- Fixed bug #34725 (CLI segmentation faults during cleanup). (Dmitry)
 - Fixed bug #34712 (zend.ze1_compatibility_mode = on segfault). (Dmitry)
 - Fixed bug #34623 (Crash in pdo_mysql on longtext fields). (Ilia)
 - Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip 

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 6b45187345decfb224fbb39ec43ecd6fa8cf363a..a70af3ea4878b0b8750bacf39c5d14156f8912da 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -100,7 +100,9 @@ static PHP_MINIT_FUNCTION(pcre)
 /* {{{ PHP_MSHUTDOWN_FUNCTION(pcre) */
 static PHP_MSHUTDOWN_FUNCTION(pcre)
 {
-#ifndef ZTS
+#ifdef ZTS
+       ts_free_id(pcre_globals_id);    
+#else
        php_pcre_shutdown_globals(&pcre_globals TSRMLS_CC);
 #endif