granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cc0c5b9 0492064)

author	Remi Collet <remi@php.net>
	Sun, 29 Mar 2020 12:23:03 +0000 (14:23 +0200)
committer	Remi Collet <remi@php.net>
	Sun, 29 Mar 2020 12:23:03 +0000 (14:23 +0200)
commit	2292ef93d5d8ff67cd5afc55495f2936a4a37596
tree	c484eec9188f23be621b944fb628b9fc6174b928	tree \| snapshot
parent	cc0c5b9343278c6bd54da0d3fe1eafc25b3ddc29	commit \| diff
parent	04920645f14ea117d5248ef3a0e03c6784c2fb49	commit \| diff

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #79424 ext/zip: don't use gl_pathc after call to globfree

ext/zip/php_zip.c

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