From: Joe <krakjoe@php.net>
Date: Thu, 8 Feb 2018 09:42:50 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~468^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=812303aa5e34de372899c2e049b5663266eba2c2;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #49876 lib path on 64bit distros
---

812303aa5e34de372899c2e049b5663266eba2c2
diff --cc NEWS
index f8d7d47cd5,cf1a583d82..e6c0eae1bf
--- a/NEWS
+++ b/NEWS
@@@ -70,13 -517,56 +70,15 @@@ PH
  - interbase:
    . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa)
  
 -- Mysqli:
 -  . Fixed bug #75434 (Wrong reflection for mysqli_fetch_all function). (Fabien
 -    Villepinte)
 -
 -- OCI8:
 -  . Fixed valgrind issue. (Tianfang Yang)
 -
 -- OpenSSL:
 -  . Fixed bug #75363 (openssl_x509_parse leaks memory). (Bob, Jakub Zelenka)
 -  . Fixed bug #75307 (Wrong reflection for openssl_open function). (villfa)
 -
 -- Opcache:
 -  . Fixed bug #75373 (Warning Internal error: wrong size calculation). (Laruence, Dmitry)
 -
 -- PGSQL:
 -  . Fixed bug #75419 (Default link incorrectly cleared/linked by pg_close()). (Sara)
 -
 -- SOAP:
 -  . Fixed bug #75464 (Wrong reflection on SoapClient::__setSoapHeaders). (villfa)
 -
 -- Zlib:
 -  . Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
 -    Villepinte)
 -
 -26 Oct 2017, PHP 7.1.11
 -
 -- Core:
 -  . Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
 -    (Laruence)
 -  . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
 -  . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
 -    request). (Nikita)
 -  . Fixed bug #75220 (Segfault when calling is_callable on parent). 
 -    (andrewnester)
 -  . Fixed bug #75290 (debug info of Closures of internal functions contain
 -    garbage argument names). (Andrea)
 -
 -- Apache2Handler:
 -  . Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in
 -    apache2handler). (mcarbonneaux)
 -
 -- Date:
 -  . Fixed bug #75055 (Out-Of-Bounds Read in timelib_meridian()). (Derick)
 +- JSON:
 +  . Added JSON_THROW_ON_ERROR flag. (Andrea)
  
 -- Hash:
 -  . Fixed bug #75303 (sha3 hangs on bigendian). (Remi)
 +- LDAP:
 +  . Added ldap_exop_refresh helper for EXOP REFRESH operation with dds overlay. 
 +    (Come)
 +  . Added full support for sending and parsing ldap controls (Come)
++  . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
+ 
 -- Intl:
 -  . Fixed bug #75318 (The parameter of UConverter::getAliases() is not
 -    optional). (cmb)
  
  - litespeed:
    . Fixed bug #75248 (Binary directory doesn't get created when building