pajoye Fri Feb 23 00:58:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/gd/libgd gdft.c
Log:
- #40578, fix the 2nd race condition on shutdown when the cache is freed
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.556&r2=1.2027.2.547.2.557&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.556 php-src/NEWS:1.2027.2.547.2.557
--- php-src/NEWS:1.2027.2.547.2.556 Wed Feb 21 15:00:26 2007
+++ php-src/NEWS Fri Feb 23 00:58:49 2007
@@ -9,7 +9,7 @@
- Added --ri switch to CLI which allows to check extension information.
(Marcus)
- Added tidyNode::getParent() method (John, Nuno)
- Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
-- Fixed bug #40578 (imagettftext() multithreading issue). (Tony)
+- Fixed bug #40578 (imagettftext() multithreading issue). (Tony, Pierre)
- Fixed bug #40576 (double values are truncated to 6 decimal digits when
encoding). (Tony)
- Fixed bug #40560 (DIR functions do not work on root UNC path). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.3&r2=1.36.4.4&diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.3
php-src/ext/gd/libgd/gdft.c:1.36.4.4
--- php-src/ext/gd/libgd/gdft.c:1.36.4.3 Wed Feb 21 15:00:26 2007
+++ php-src/ext/gd/libgd/gdft.c Fri Feb 23 00:58:49 2007
@@ -718,9 +718,10 @@
void gdFontCacheShutdown()
{
if (fontCache) {
- gdMutexShutdown(gdFontCacheMutex);
+ gdMutexLock(gdFontCacheMutex);
gdCacheDelete(fontCache);
fontCache = NULL;
+ gdMutexShutdown(gdFontCacheMutex);
FT_Done_FreeType(library);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
