summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2016-04-18 08:18:56 +0200
committerFerenc Kovacs <tyrael@php.net>2016-04-18 08:18:56 +0200
commita4d29eeb46782b1db2a3d8c85c05511da3d151f6 (patch)
tree2efe6186035e589bc17ac1c7a9bdd5a0993fd521
parent5142bf27b2039ebb7f5a6cc431770700180f9fbf (diff)
downloadphp-git-a4d29eeb46782b1db2a3d8c85c05511da3d151f6.tar.gz
prepare for 5.6.21RC1
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 86319c2e18..5f3ba03951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.21
+18 Apr 2016, PHP 5.6.21RC1
- Core:
. Fixed bug #69537 (__debugInfo with empty string for key gives error).
diff --git a/configure.in b/configure.in
index 631a0eeb99..c91ce2e482 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=6
PHP_RELEASE_VERSION=21
-PHP_EXTRA_VERSION="-dev"
+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 d1c3f04202..9e0acba621 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 21
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.21-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.21RC1"
#define PHP_VERSION_ID 50621