From: Joe <krakjoe@php.net>
Date: Thu, 8 Feb 2018 09:42:25 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.3RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d803dcba3b018ddc6acf31b2614a78f29a30524b;p=php

Merge branch 'PHP-7.1' into PHP-7.2

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

d803dcba3b018ddc6acf31b2614a78f29a30524b
diff --cc NEWS
index 9cefdf52c4,4716446bf8..cf1a583d82
--- a/NEWS
+++ b/NEWS
@@@ -9,14 -6,16 +9,17 @@@ PH
    . Fixed bug #75882 (a simple way for segfaults in threadsafe php just with
      configuration). (Anatol)
  
 -- PGSQL:
 -  . Fixed #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)
 -
 -- ODBC:
 -  . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
 -
+ - LDAP:
+   . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
+ 
 +- PGSQL:
 +  . Fixed bug #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)
 +
  - Phar:
 +  . Fixed bug #54289 (Phar::extractTo() does not accept specific directories to
 +    be extracted). (bishop)
 +  . Fixed bug #65414 (deal with leading slash while adding files correctly). 
 +    (bishopb)
    . Fixed bug #65414 (deal with leading slash when adding files correctly).
      (bishopb)