diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:19:32 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-12-16 10:19:32 -0800 |
| commit | 681a1afd3f76e97b243184e83ab826633e851cc3 (patch) | |
| tree | 105ea8fd8676d603d1d0fb44cb38e4ba55a09b1e /ext/zip/php_zip.c | |
| parent | 181f34f3757563381ce8eaf963e73cd64b38ec21 (diff) | |
| parent | 8efd73c4d219e809167eda733bd74c3f2c0dc64e (diff) | |
| download | php-git-681a1afd3f76e97b243184e83ab826633e851cc3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions