dmitry Fri Oct 28 04:30:42 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/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/NEWS?r1=1.2027.2.164&r2=1.2027.2.165&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.164 php-src/NEWS:1.2027.2.165
--- php-src/NEWS:1.2027.2.164 Wed Oct 26 17:38:19 2005
+++ php-src/NEWS Fri Oct 28 04:30:36 2005
@@ -22,6 +22,7 @@
- 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
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.168.2.2&r2=1.168.2.3&ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.2
php-src/ext/pcre/php_pcre.c:1.168.2.3
--- php-src/ext/pcre/php_pcre.c:1.168.2.2 Tue Oct 11 02:47:48 2005
+++ php-src/ext/pcre/php_pcre.c Fri Oct 28 04:30:41 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.2 2005/10/11 06:47:48 dmitry Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.3 2005/10/28 08:30:41 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
