From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 25 Aug 2017 20:03:07 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ef89649976e1c05c981c3004a12cf3d9e001822;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

3ef89649976e1c05c981c3004a12cf3d9e001822
diff --cc NEWS
index f354295a71,2154357ebd..6262cb69f1
--- a/NEWS
+++ b/NEWS
@@@ -7,15 -7,11 +7,19 @@@ 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)
  
+ - Intl:
+   . Fixed bug #75090 (IntlGregorianCalendar doesn't have constants from parent
+     class). (tpunt)
+ 
 +- PCRE:
 +  . Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after
 +    first input string). (Dmitry)
 +
  - PDO_OCI:
    . Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized
      before PHP-FPM sets it up). (Ingmar Runge)