com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Keyur Govande | Date: | Mon, 26 Jan 2015 21:32:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84377@lists.php.net to get a copy of this message | ||
Commit: 168877bc78376fe7c0e3130c5305c66d2865eb38
Author: Keyur Govande <keyur@php.net> Mon, 26 Jan 2015 21:32:32 +0000
Parents: 4c6918ec17dba26203c0ff3330dccf8b5f84d867 d065a2fc1baa01fa8788c9fb2811ce7707cf5088
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=168877bc78376fe7c0e3130c5305c66d2865eb38
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS
Patch commit d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte
floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqlnd/config9.m4
Bugs:
https://bugs.php.net/68114
https://bugs.php.net/68657
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 0162123,2a25af0..cec955c
--- a/NEWS
+++ b/NEWS
@@@ -28,7 -25,13 +28,13 @@@
. Fixed bug #68260 (SQLite3Result::fetchArray declares wrong
required_num_args). (Julien)
+ - Mysqli:
+ . Fixed bug #68114 (linker error on some OS X machines with fixed
+ width decimal support) (Keyur Govande)
+ . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
+ has rounding errors) (Keyur Govande)
+
-22 Jan 2015, PHP 5.5.21
+22 Jan 2015, PHP 5.6.5
- Core:
. Upgraded crypt_blowfish to version 1.3. (Leigh)