]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb991bd 43e3a83)
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Thu, 29 May 2014 17:56:32 +0000 (17:56 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 29 May 2014 17:56:32 +0000 (17:56 +0000)
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS

1  2 
ext/spl/spl_array.c patch | diff1 | diff2 | blob | history

diff --cc ext/spl/spl_array.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.