summaryrefslogtreecommitdiff
path: root/main/php_version.h
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-12-10 11:35:26 -0800
committerJulien Pauli <jpauli@php.net>2013-12-11 00:03:32 +0100
commit073d24bb50eeab6b592d044c71e530afac0a474a (patch)
treee7bf02b3060dbefbda05ebd23fff23b5ceeebf12 /main/php_version.h
parentbdb901b64a5d6ea6842dfb58d215af021668ef1b (diff)
downloadphp-git-073d24bb50eeab6b592d044c71e530afac0a474a.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 'main/php_version.h')
0 files changed, 0 insertions, 0 deletions