From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Apr 2014 00:22:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

Conflicts:
	ext/phar/phar_path_check.c
---

dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0
diff --cc NEWS
index 660ea4e21a,6635a8e552..ca0617cb51
--- a/NEWS
+++ b/NEWS
@@@ -15,10 -12,15 +15,14 @@@ PH
      not only the subset). (Anatol)
  
  - FPM:
 -  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor). 
 +  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
      (Julio Pintos)
  
+ - Phar:
 -  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent 
 -    in its name). (PR #588) 
 -
 -?? ??? 2014, PHP 5.4.28
++  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
++    in its name). (PR #588)
+ 
 +?? ??? 2014, PHP 5.5.12
  - Core:
    . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
    . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace