granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 412feff b8042ac)

author	Adam Harvey <aharvey@php.net>
	Thu, 29 May 2014 17:57:54 +0000 (17:57 +0000)
committer	Adam Harvey <aharvey@php.net>
	Thu, 29 May 2014 17:57:54 +0000 (17:57 +0000)
commit	f4a235c541c5d94c88217e1b6707943b7e30cb5a
tree	ea9381a3e6d7bc19e55a75e0d6e9c798635f53ba	tree \| snapshot
parent	412feff4be28565b8d8340002edcad8ed132d6d9	commit \| diff
parent	b8042acdde8caaa1660eb56e6b56a161c25b7408	commit \| diff

Merge branch 'PHP-5.6'

* PHP-5.6:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS

ext/spl/spl_array.c

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