summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-03-05 19:13:19 +0100
committerFerenc Kovacs <tyrael@php.net>2015-03-05 19:13:19 +0100
commitd24c57e8350f786cebc2573c85b6664d75bac74a (patch)
tree6dc6f03f32cc1068b6db5f0f74f390f601714f11
parentd4d05c891950fc7612fc4db9a2bac1920d9903dd (diff)
downloadphp-git-d24c57e8350f786cebc2573c85b6664d75bac74a.tar.gz
5.6.7RC1
-rw-r--r--NEWS4
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 7 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 47e5858ac8..a2a8d8fe14 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Apr 2015, PHP 5.6.8
-
-19 Mar 2015, PHP 5.6.7
+05 Mar 2015, PHP 5.6.7RC1
- Core:
. Fixed bug #69174 (leaks when unused inner class use traits precedence).
diff --git a/configure.in b/configure.in
index 8a3df3deff..98fa1d6052 100644
--- a/configure.in
+++ b/configure.in
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=6
-PHP_RELEASE_VERSION=8
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=7
+PHP_EXTRA_VERSION="RC1"
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 959e7cebf6..533b707bf7 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
-#define PHP_RELEASE_VERSION 8
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.8-dev"
-#define PHP_VERSION_ID 50608
+#define PHP_RELEASE_VERSION 7
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.7RC1"
+#define PHP_VERSION_ID 50607