summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-05-25 10:22:53 +0200
committerAnatol Belski <ab@php.net>2016-05-25 10:22:53 +0200
commitbcad8619f8cf5796571a4207aa9b4a86ee1b03b3 (patch)
tree66b51dbed05beb55b25e19edd4a3ab0a96e879c2
parent3ed0114e7f25f683eede5528e3b31f2fe2495393 (diff)
downloadphp-git-bcad8619f8cf5796571a4207aa9b4a86ee1b03b3.tar.gz
set version and update NEWS
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 10 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index db3a5014ae..b81ccda5ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-12 May 2016 PHP 7.0.7RC1
+26 May 2016 PHP 7.0.7R
- Core:
. Fixed bug #72162 (use-after-free - error_reporting). (Laruence)
@@ -27,6 +27,12 @@ PHP NEWS
. Fixed bug #72069 (Behavior \JsonSerializable different from json_encode).
(Laruence)
+- GD:
+ . Fixed bug #72227 (imagescale out-of-bounds read). (Stas)
+
+- Intl:
+ . Fixed #72241 (get_icu_value_internal out-of-bounds read). (Stas)
+
- Mbstring:
. Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace). (Laruence)
diff --git a/configure.in b/configure.in
index 2978377c9f..0ac0dc9c1b 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=0
PHP_RELEASE_VERSION=7
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 9c59b4dd39..147b77f307 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "7.0.7RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.0.7"
#define PHP_VERSION_ID 70007