com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS
| From: | Stanislav Malyshev | Date: | Fri, 15 Aug 2014 00:21:29 +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-79879@lists.php.net to get a copy of this message | ||
Commit: 3468f03b6f551d927e64af00eddcc2d73bb82154
Author: Stanislav Malyshev <stas@php.net> Thu, 14 Aug 2014 17:19:51 -0700
Parents: ff4cf1a838891d3b71165768b2c5857cc2fa04ed 49387b31cf8bda25a85b6932380001be03d6c8b0
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3468f03b6f551d927e64af00eddcc2d73bb82154
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
Bugs:
https://bugs.php.net/67716
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index ac3937a,1339ba8..e6a87e6
--- a/NEWS
+++ b/NEWS
@@@ -6,17 -6,13 +6,17 @@@ PH
. Fixed bug #47358 (glob returns error, should be empty array()).. (Pierre)
- OpenSSL:
- . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
+ . 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 #66091 (memory leaks in DateTime constructor). (Tjerk).
-?? ??? 2014, PHP 5.4.32
+?? ??? 2014, PHP 5.5.16
- COM:
. Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
@@@ -25,23 -21,20 +25,24 @@@
- Fileinfo:
. Fixed bug #67705 (extensive backtracking in rule regular expression).
- (CVE-2014-3538). (Remi)
+ (CVE-2014-3538) (Remi)
+ . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi)
+- FPM:
+ . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
+ (pacho@gentoo.org, Remi)
+
- GD:
. Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference).
- (CVE-2014-2497). (Remi)
+ (CVE-2014-2497) (Remi)
- Milter:
. Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike)
-
+
- OpenSSL:
-- . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
++ . Fixed missing type checks in OpenSSL options. (Yussuf Khalil, Stas)
-- Readline:
+- readline:
. Fixed bug #55496 (Interactive mode doesn't force a newline before the
prompt). (Bob, Johannes)
. Fixed bug #67496 (Save command history when exiting interactive shell