From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 20 Feb 2018 15:24:29 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.4RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e80e38ab7caa09b91c841d9b0e711791d75d8883;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix openssl_* arginfos
---

e80e38ab7caa09b91c841d9b0e711791d75d8883
diff --cc NEWS
index 652eedb0fc,5bcdd14d56..1d36c307d3
--- a/NEWS
+++ b/NEWS
@@@ -44,6 -23,19 +44,9 @@@ PH
    . Fixed bug #75969 (Assertion failure in live range DCE due to block pass
      misoptimization). (Nikita)
  
+ - OpenSSL:
+   . Fixed openssl_* arginfos. (carusogabriel)
+ 
 -- LDAP:
 -  . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
 -
 -- libxml2:
 -  . Fixed bug #75871 (use pkg-config where available). (pmmaga)
 -
 -- Phar:
 -  . Fixed bug #65414 (deal with leading slash when adding files correctly).
 -    (bishopb)
 -
  - SPL:
    . Fixed bug #74519 (strange behavior of AppendIterator). (jhdxr)