summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-04-14 00:08:57 -0700
committerStanislav Malyshev <stas@php.net>2015-04-14 00:08:57 -0700
commitaa2eca2e4847439c0eb28dc8c2c3534083807e26 (patch)
treedd1206d1fb573d1e85b21590cc4759734d4f35d2
parentf59b67ae50064560d7bfcdb0d6a8ab284179053c (diff)
parent9bed19a1e0d78612426e5710aefe6ce31ca30923 (diff)
downloadphp-git-aa2eca2e4847439c0eb28dc8c2c3534083807e26.tar.gz
Merge branch 'PHP-5.4' into PHP-5.4.40
* PHP-5.4: fix CVE num
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 584defdc4e..40b1a654d0 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@ PHP NEWS
- Core:
. Fixed bug #68976 (Use After Free Vulnerability in unserialize())
- (CVE-2015-0231). (Stas)
+ (CVE-2015-2787). (Stas)
. Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
configuration options). (Anatol Belski)
. Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)