]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Wed, 14 Aug 2013 05:24:29 +0000 (22:24 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 14 Aug 2013 05:24:29 +0000 (22:24 -0700)
* PHP-5.3:
  Fix CVE-2013-4073 - handling of certs with null bytes


Trivial merge