granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 17470df 32d1d5f)

author	Remi Collet <remi@php.net>
	Thu, 19 Dec 2013 09:54:06 +0000 (10:54 +0100)
committer	Remi Collet <remi@php.net>
	Thu, 19 Dec 2013 09:54:06 +0000 (10:54 +0100)
commit	99b91f98b11c7279f8312506bd556f4c3e1e7fea
tree	c9e42333a88ff38c27b1431308cf04b24d323d93	tree \| snapshot
parent	17470df2a508fc5b8aaaf10cd97673d5aa133692	commit \| diff
parent	32d1d5fb596dec74b555ff2077930e95cda1a3b0	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
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.