summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2016-04-28 01:58:26 +0200
committerFerenc Kovacs <tyrael@php.net>2016-04-28 01:58:26 +0200
commitc829b4e9794d7744d400d3669f161d4c6f17a502 (patch)
treeccc1d7f85d08a284711738ab7c4f8c474e74bb1b
parent0142c830aa7d773d69db90036b37cff5edd0cbec (diff)
downloadphp-git-c829b4e9794d7744d400d3669f161d4c6f17a502.tar.gz
5.6.21
-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 d10e057924..1b8c11fae0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-18 Apr 2016, PHP 5.6.21RC1
+28 Apr 2016, PHP 5.6.21
- Core:
. Fixed bug #69537 (__debugInfo with empty string for key gives error).
diff --git a/configure.in b/configure.in
index c91ce2e482..c099a4df47 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="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 9e0acba621..d1c22821cf 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 "RC1"
-#define PHP_VERSION "5.6.21RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.21"
#define PHP_VERSION_ID 50621