]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Thu, 19 Dec 2013 09:54:06 +0000 (10:54 +0100)
committerRemi Collet <remi@php.net>
Thu, 19 Dec 2013 09:54:06 +0000 (10:54 +0100)
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

1  2 
ext/zip/php_zip.c

Simple merge