dmitry Fri Oct 28 04:31:01 2005 EDT
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
Fixed bug #34725 (CLI segmentation faults during cleanup in ZTS if ext/pcre
is DSO)
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.173&r2=1.174&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.173 php-src/ext/pcre/php_pcre.c:1.174
--- php-src/ext/pcre/php_pcre.c:1.173 Wed Oct 12 18:45:15 2005
+++ php-src/ext/pcre/php_pcre.c Fri Oct 28 04:31:01 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.173 2005/10/12 22:45:15 helly Exp $ */
+/* $Id: php_pcre.c,v 1.174 2005/10/28 08:31:01 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -100,7 +100,9 @@
/* {{{ 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
