diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-10-28 08:30:41 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-10-28 08:30:41 +0000 |
| commit | 36a14076a8902fafd355a3ad15d64a96d4bb4e31 (patch) | |
| tree | a593fa66b430074c30ed04661dae9c6e80acb451 | |
| parent | 3815b367d5d044eec32b3169611ea6108e34efb9 (diff) | |
| download | php-git-36a14076a8902fafd355a3ad15d64a96d4bb4e31.tar.gz | |
Fixed bug #34725 (CLI segmentation faults during cleanup in ZTS if ext/pcre is DSO)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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 6b45187345..a70af3ea48 100644 --- 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 |