com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS configure.in
| From: | Stanislav Malyshev | Date: | Mon, 05 Jan 2015 04:55:17 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83979@lists.php.net to get a copy of this message | ||
Commit: ec550cd783e9cac8715c1c88b56654b2819bc0ec
Author: Stanislav Malyshev <stas@php.net> Sun, 4 Jan 2015 20:54:46 -0800
Parents: 97f894e1899ba9773b8c213b56d34b1f1a9b03d9 eeae4651f72244f68a15e4be69a465b66b1661f7
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec550cd783e9cac8715c1c88b56654b2819bc0ec
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Bugs:
https://bugs.php.net/66764
Changed paths:
MM NEWS
MM configure.in
Diff:
diff --cc NEWS
index d1c3f5a,4879a9e..0f0abb8
--- a/NEWS
+++ b/NEWS
@@@ -12,9 -13,11 +12,11 @@@
. Fixed bug #68297 (Application Popup provides too few information). (Anatol)
. Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
. Fixed bug #65230 (setting locale randomly broken). (Anatol)
+ . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR
+ correctly). (Ferenc)
. Fixed bug #68583 (Crash in timeout thread).. (Anatol)
- . Fixed bug #68594 (Use after free vulnerability in unserialize()).
- (CVE-2014-8142) (Stefan Esser)
+ . Fixed bug #65576 (Constructor from trait conflicts with inherited
+ constructor). (dunglas at gmail dot com)
. Fixed bug #68676 (Explicit Double Free). (Kalle)
- CGI: