com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS
| From: | Sara Golemon | Date: | Tue, 19 Aug 2014 20:17:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80620@lists.php.net to get a copy of this message | ||
Commit: ac4569621dc8762862dca6d39adf4ceb39e7e00b
Author: Sara Golemon <pollita@php.net> Tue, 19 Aug 2014 13:17:56 -0700
Parents: b278be894fcd0f2cbaee93e3f657f7f9beeb532f cbe1597b747474388912c91018b0e12275784720
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ac4569621dc8762862dca6d39adf4ceb39e7e00b
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 8cc7eb0,5df4032..37d7de8
--- a/NEWS
+++ b/NEWS
@@@ -7,20 -7,15 +7,23 @@@ PH
- OpenSSL:
. Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
- (Daniel Lowrey).
+ (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 #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)
+ - GD
+ . Made fontFetch's path parser thread-safe. (Sara).
+
-?? ??? 2014, PHP 5.4.32
+?? ??? 2014, PHP 5.5.16
- COM:
. Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).