com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS
| From: | Christoph Michael Becker | Date: | Sun, 27 Aug 2017 12:07:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99171@lists.php.net to get a copy of this message | ||
Commit: 1aeafb7d4aaad1e767d9be8cec3641bc1775bf47
Author: Christoph M. Becker <cmbecker69@gmx.de> Sun, 27 Aug 2017 14:07:29 +0200
Parents: cc577749a8c95e6f15f5a859961a995a82828c8e a9ff4d1f5a6c8d74a32b8c0c446504526db239bc
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1aeafb7d4aaad1e767d9be8cec3641bc1775bf47
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75124 (gdImageGrayScale() may produce colors)
Bugs:
https://bugs.php.net/75124
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index c130d5bb,b702068..51fa5e5
--- 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