From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 27 Aug 2017 12:07:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aeafb7d4aaad1e767d9be8cec3641bc1775bf47;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
---

1aeafb7d4aaad1e767d9be8cec3641bc1775bf47
diff --cc NEWS
index c130d5bb03,b70206849c..51fa5e5d2e
--- a/NEWS
+++ b/NEWS
@@@ -7,10 -7,9 +7,11 @@@ PH
  
  - CURL:
    . Fixed bug #75093 (OpenSSL support not detected). (Remi)
 +  . Better fix for #74125 (use pkg-config instead of curl-config). (Remi)
  
  - GD:
 +  . Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image). (cmb)
+   . Fixed bug #75124 (gdImageGrayScale() may produce colors). (cmb)
  
  - Intl:
    . Fixed bug #75090 (IntlGregorianCalendar doesn't have constants from parent