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

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixes bug #75871 Use pkg-config for libxml2 if available
---

f9a16d492e4ab5d9e98a68206b80a4753631d8c0
diff --cc NEWS
index cf1a583d82,3561319f4d..d5820fba52
--- a/NEWS
+++ b/NEWS
@@@ -12,14 -9,16 +12,17 @@@ PH
  - LDAP:
    . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke)
  
+ - libxml2:
+   . Fixed bug #75871 (use pkg-config where available). (pmmaga)
+ 
 +- 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)