com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/gd/gd.c
| From: | Christoph Michael Becker | Date: | Tue, 02 Aug 2016 16:56:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93530@lists.php.net to get a copy of this message | ||
Commit: 3d0002ed369602c4eb8c37ee69b1eb947fd9fa56
Author: Christoph M. Becker <cmb@php.net> Tue, 2 Aug 2016 18:53:54 +0200
Parents: 02fce3ecea252c7916a8bcc76195d9c68fb939d4 3a8c027ec383811ed8a61e3db604d89b5efa58d6
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d0002ed369602c4eb8c37ee69b1eb947fd9fa56
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/gd/gd.c
Diff:
diff --cc NEWS
index 7a411d2,27bd7b0..eaec429
--- a/NEWS
+++ b/NEWS
@@@ -23,9 -47,29 +23,12 @@@ PH
- Intl:
. Fixed bug #72639 (Segfault when instantiating class that extends
IntlCalendar and adds a property). (Laruence)
- . Partially fixed #72506 (idn_to_ascii for UTS #46 incorrect for long domain
- names). (cmb)
+ . Fixed bug #72658 (Locale::lookup() / locale_lookup() hangs if no match
+ found). (Anatol)
+
++- GD:
++ . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
+
- mbstring:
. Fixed bug #72691 (mb_ereg_search raises a warning if a match zero-width).
(cmb)