com php-src: Merge branch 'pull-request/975' into PHP-5.5: NEWS
| From: | Stanislav Malyshev | Date: | Mon, 05 Jan 2015 04:54:29 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/975' into PHP-5.5: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83980@lists.php.net to get a copy of this message | ||
Commit: eeae4651f72244f68a15e4be69a465b66b1661f7
Author: Stanislav Malyshev <stas@php.net> Sun, 4 Jan 2015 20:46:40 -0800
Parents: 5639c3350e2d33b7e8f4b3c792f998aad08c293a 83db77532398f4c9da7625ffb42de4a6ece9c20f
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=eeae4651f72244f68a15e4be69a465b66b1661f7
Log:
Merge branch 'pull-request/975' into PHP-5.5
* pull-request/975:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Bugs:
https://bugs.php.net/66764
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index afbc492,af21bb4..4879a9e
--- a/NEWS
+++ b/NEWS
@@@ -13,6 -13,6 +13,8 @@@ PH
.. 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)