]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc8f776 b1b23ab)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 10 Dec 2013 19:35:26 +0000 (11:35 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 10 Dec 2013 19:35:26 +0000 (11:35 -0800)
* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

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

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