summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-16 11:07:25 -0700
committerChristopher Jones <sixd@php.net>2013-08-16 11:07:25 -0700
commit6993ca5bd71541e77853fc1739355efe889f9a02 (patch)
tree97bacfe17a89c005f3385dab945931cd43597cd0
parent0ebef462ceb50094e64a8d48bf705594175f86ab (diff)
parent060fadca31c61a36823954d030a987a73d04ea02 (diff)
downloadphp-git-6993ca5bd71541e77853fc1739355efe889f9a02.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: fix cve number
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4b75071ed2..a63bfe6877 100644
--- a/NEWS
+++ b/NEWS
@@ -102,7 +102,7 @@ PHP NEWS
odbc_fetch_array). (Brandon Kirsch)
- Openssl:
- . Fixed handling null bytes in subjectAltName (CVE-2013-4073).
+ . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
(Christian Heimes)
- PDO: