From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 25 Aug 2016 16:30:58 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f53814ca7ffa71471b38beb1640a06c1a98c34a;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

3f53814ca7ffa71471b38beb1640a06c1a98c34a
diff --cc NEWS
index 03b36431d5,630b1c62f8..74772a7270
--- a/NEWS
+++ b/NEWS
@@@ -9,7 -14,16 +9,11 @@@ PH
    . Fixed bug #72922 (COM called from PHP does not return out parameters).
      (Anatol)
  
- -GD:
+ - Dba:
+   . Fixed bug #70825 (Cannot fetch multiple values with group in ini file).
+     (cmb)
+ 
 -- FTP:
 -  . Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with
 -    require_ssl_reuse). (Benedict Singer)
 -
+ - GD:
 -  . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
    . Fixed bug #66005 (imagecopy does not support 1bit transparency on truecolor
      images). (cmb)
    . Fixed bug #72913 (imagecopy() loses single-color transparency on palette