]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 24 Jul 2013 04:44:54 +0000 (21:44 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 24 Jul 2013 04:45:35 +0000 (21:45 -0700)
commitb8c8a04a85baf4bee2e3ce5891cd7d5d97cea303
treeb6e6d2bcd26ea33ef88c2e3da38c91d087960b8f
parentf9000fde98195844b4d1c1d6209f9796da3ebee8
parent96a53f6715ac563fa70f2db231478ecd0d313ff0
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65028  Phar::buildFromDirectory creates corrupt archives for some specific contents
NEWS
ext/phar/phar.c