com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/gd/libgd/gdft.c

Commit: a309dda7771503b5972b5faec2f3234ed0637781 Author: Sara Golemon <pollita@php.net> Tue, 19 Aug 2014 13:22:14 -0700 Parents: fae17a00f556b7c1a2221289c46403bfb4367034 ac4569621dc8762862dca6d39adf4ceb39e7e00b Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a309dda7771503b5972b5faec2f3234ed0637781 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Switch use of strtok() to gd_strtok_r() Changed paths: MM NEWS MM ext/gd/libgd/gdft.c Diff: diff --cc NEWS index 7fd94e3,37d7de8..4909a5d --- a/NEWS +++ b/NEWS @@@ -1,13 -1,32 +1,16 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2014, PHP 5.5.17 +?? ??? 2014, PHP 5.6.0 ??? -- Core: - . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre) - -- OpenSSL: - . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads). - (Daniel Lowrey) - -- SPL: - . Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException - wrong message). (tim_siebels_aurich at yahoo dot de) - -- Date: - . Fixed bug #66091 (memory leaks in DateTime constructor). (Tjerk) - . Fixed bug #66985 (Some timezones are no longer valid in PHP 5.5..10). - (Derick) - . Fixed bug #67109 (First uppercase letter breaks date string parsing). - (Derick) +- Fileinfo: + . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi) + - GD - . Made fontFetch's path parser thread-safe. (Sara). ++ . Made fontFetch's path parser thread-safe. (Sara) + -?? ??? 2014, PHP 5.5.16 +14 Aug 2014, PHP 5.6.0 Release Candidate 4 - COM: - . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas). . Fixed bug #41577 (DOTNET is successful once per server run) (Aidas Kasparas)