diff options
author | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:36:06 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:36:06 -0800 |
commit | 293984ac33da340f4193afdc1710682af363af56 (patch) | |
tree | e10075d3bcca488da4934e59b216b0e5415028c8 /sapi/phpdbg/phpdbg_help.c | |
parent | 45d8802441491c6daf4c0ccd7cc75a49d832193f (diff) | |
parent | 41cd53329871cb99799cd9a8f76151312be2e960 (diff) | |
download | php-git-293984ac33da340f4193afdc1710682af363af56.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions