com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS
| From: | Stanislav Malyshev | Date: | Mon, 04 Aug 2014 07:06:22 +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-79706@lists.php.net to get a copy of this message | ||
Commit: c9e114a4515491ac454b7a058cf11fd8a407fbd1
Author: Stanislav Malyshev <stas@php.net> Mon, 4 Aug 2014 00:05:56 -0700
Parents: 95febf26c67b7ccb8703dc8b005658ebd851cb89 eeaec70758bfc0c0e2c0f8944c8dbeae02866206
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=c9e114a4515491ac454b7a058cf11fd8a407fbd1
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67705 (extensive backtracking in rule regular expression)
Bugs:
https://bugs.php.net/67705
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 70df98f,15d286d..6cae7ad
--- a/NEWS
+++ b/NEWS
@@@ -5,13 -5,13 +5,17 @@@ PH
- COM:
. Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
+ - Fileinfo:
+ . Fixed bug #67705 (extensive backtracking in rule regular expression).
+ (CVE-2014-3538) (Remi)
+
+- FPM:
+ . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
+ (pacho@gentoo.org, 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).