diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:33:40 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-12-10 11:34:35 -0800 |
| commit | 71daf3229b5707a3553dc7d1971e8a0e77cd9dfb (patch) | |
| tree | 830d2ef619705dc38abae33f4e63fd9d4b6f115b /ext/xml/php_xml.h | |
| parent | c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b (diff) | |
| parent | 8650bbc8dc6c3b416454f5e38812430edbd438c6 (diff) | |
| download | php-git-71daf3229b5707a3553dc7d1971e8a0e77cd9dfb.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/xml/php_xml.h')
0 files changed, 0 insertions, 0 deletions