]> granicus.if.org Git - php/commit
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)
commit41cd53329871cb99799cd9a8f76151312be2e960
tree9240548c199fee937652673564f61b5b8505e78d
parentbc8f7761f37d0cadfe72725c7b5e37d698b4db5d
parentb1b23abc868e25f9ee083e8837c37867516ee380
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
ext/openssl/openssl.c