From: Jakub Zelenka <bukka@php.net>
Date: Mon, 24 Apr 2017 16:12:55 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7260f65c62477b6127d2b787ceea88b13d171539;p=php

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

7260f65c62477b6127d2b787ceea88b13d171539
diff --cc NEWS
index c65218eefc,185a85d8bd..086fe31690
--- a/NEWS
+++ b/NEWS
@@@ -37,20 -36,10 +37,22 @@@ PH
    . Fixed bug #74376 (Invalid free of persistent results on error/connection
      loss). (Yussuf Khalil)
  
 +- Intl:
 +  . Fixed bug #65683 (Intl does not support DateTimeImmutable). (Ben Scholzen)
 +  . Fixed bug #74298 (IntlDateFormatter->format() doesn't return
 +    microseconds/fractions). (Andrew Nester)
 +  . Fixed bug #74433 (wrong reflection for Normalizer methods). (villfa)
 +  . Fixed bug #74439 (wrong reflection for Locale methods). (villfa)
 +
 +- Opcache:
 +  . Fixed bug #74456 (Segmentation error while running a script in CLI mode).
 +    (Laruence)
 +  . Fixed bug #74431 (foreach infinite loop). (Nikita)
 +  . Fixed bug #74442 (Opcached version produces a nested array). (Nikita)
 +
  - OpenSSL:
+   . Fixed bug #73833 (null character not allowed in openssl_pkey_get_private).
+     (Jakub Zelenka)
    . Fixed bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH
      key). (Jakub Zelenka)
    . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without