summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-08-14 21:26:05 -0700
committerStanislav Malyshev <stas@php.net>2012-08-14 21:26:05 -0700
commit3548b2e2c5bbe361c3c95a4df563e81f33da4b7e (patch)
treec0becfe43eb70d7f5974aac2a9892e699fe595fd
parent1fc35147349d06983a3bf49af0f91f3077dc1512 (diff)
downloadphp-git-PHP-5.4.6.tar.gz
-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 7740deea94..2c8a06f540 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-02 Aug 2012, PHP 5.4.6 RC1
+16 Aug 2012, PHP 5.4.6
- CLI Server:
. Implemented FR #62700 (have the console output 'Listening on
diff --git a/configure.in b/configure.in
index b52fbf5e7d..c119869cdb 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=4
PHP_RELEASE_VERSION=6
-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 06a924ec3a..8fd49ecf72 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.6RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.6"
#define PHP_VERSION_ID 50405