From: Joe Watkins <krakjoe@php.net>
Date: Thu, 30 Mar 2017 15:28:14 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6373ce7c1b3317082da7bd8785088788d14139d4;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix bug #74343 compile fails on solaris 11 with system libgd
---

6373ce7c1b3317082da7bd8785088788d14139d4
diff --cc NEWS
index 97f07e10a7,32646abc05..8c7afbcf0e
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,14 +1,18 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.19
 +?? ??? 2017, PHP 7.1.5
  
+ - GD:
+   . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
+     (krakjoe)
+ 
 -13 Apr 2017 PHP 7.0.18
 +- Intl:
 +  . Fixed bug #65683 (Intl does not support DateTimeImmutable). (Ben Scholzen)
 +
 +13 Apr 2017, PHP 7.1.4
  
  - Core:
 +  . Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
    . Fixed bug #73370 (falsely exits with "Out of Memory" when using
      USE_ZEND_ALLOC=0). (Nikita)
    . Fixed bug #73960 (Leak with instance method calling static method with