diff options
author | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:35:26 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:35:26 -0800 |
commit | 41cd53329871cb99799cd9a8f76151312be2e960 (patch) | |
tree | 9240548c199fee937652673564f61b5b8505e78d /sapi/phpdbg/phpdbg_frame.h | |
parent | bc8f7761f37d0cadfe72725c7b5e37d698b4db5d (diff) | |
parent | b1b23abc868e25f9ee083e8837c37867516ee380 (diff) | |
download | php-git-41cd53329871cb99799cd9a8f76151312be2e960.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.h')
0 files changed, 0 insertions, 0 deletions