granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 391fe52 20eb8e4)

author	Remi Collet <remi@php.net>
	Thu, 19 Dec 2013 09:53:50 +0000 (10:53 +0100)
committer	Remi Collet <remi@php.net>
	Thu, 19 Dec 2013 09:53:50 +0000 (10:53 +0100)
commit	32d1d5fb596dec74b555ff2077930e95cda1a3b0
tree	b152dcf5c1c02639beac356640f42745a5e3dbb9	tree \| snapshot
parent	391fe528b71a20e16c0eae08bd99fa8f95ce00b6	commit \| diff
parent	20eb8e4d11d46c399f2920af0a552007d8d5d608	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

ext/zip/php_zip.c

Unnamed repository; edit this file 'description' to name the repository.