From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Apr 2014 00:23:15 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~352^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32d5f269a03b554a0d3ebc96fcacc842e3344e4e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
---

32d5f269a03b554a0d3ebc96fcacc842e3344e4e
diff --cc NEWS
index d1de079b67,ca0617cb51..63114a87ea
--- a/NEWS
+++ b/NEWS
@@@ -57,13 -68,10 +57,17 @@@ PH
    . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
    . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma)
  
 -- SimpleXML:
 -  . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
 -    (Anatol)
 +- PDO:
 +  . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir).
 +    (Matteo)
 +
 +- PDO-ODBC:
 +  . Fixed bug #50444 (PDO-ODBC changes for 64-bit). 
 +
++- Phar:
++  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
++    in its name). (PR #588)
+ 
  - SQLite:
    . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)