com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_hash.c
| From: | Nikita Popov | Date: | Sat, 20 Jun 2015 14:40:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87406@lists.php.net to get a copy of this message | ||
Commit: e09d3155a172bdded3cfcff921f676be57ae8d5b
Author: Nikita Popov <nikic@php.net> Sat, 20 Jun 2015 16:40:27 +0200
Parents: bca005c8d9fa047e2d4b0f2496f771f4a74f458d 5fe078abba7dc87ecc05fa3b9bf544867e947567
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e09d3155a172bdded3cfcff921f676be57ae8d5b
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
MM Zend/zend_hash.c
Diff:
diff --cc NEWS
index a071212,822ff10..45428e3
--- a/NEWS
+++ b/NEWS
@@@ -13,10 -13,10 +13,12 @@@ PH
fault). (Christoph M. Becker)
. Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
7/8/8.1/10 as "Business"). (Christian Wenz)
+ . Fixed bug #69740 (finally in generator (yield) swallows exception in
+ iteration). (Nikita)
- . Fixes bug #69835 (phpinfo() does not report many Windows SKUs).
+ . Fixed bug #69835 (phpinfo() does not report many Windows SKUs).
(Christian Wenz)
+ . Fixed bug #69892 (Different arrays compare indentical due to integer key
+ truncation). (Nikita)
- GD:
. Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)