summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-07-31 21:58:45 -0700
committerStanislav Malyshev <stas@php.net>2012-07-31 21:58:45 -0700
commit1fc35147349d06983a3bf49af0f91f3077dc1512 (patch)
treee13aff9361247a89a8d2556d27a0e962dd21490f
parentff729aabf7a3dd7bd76b50dcaf7051e414f3714c (diff)
downloadphp-git-1fc35147349d06983a3bf49af0f91f3077dc1512.tar.gz
5.4.6rc1php-5.4.6RC1
-rw-r--r--NEWS2
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 3fbbe7cc79..7740deea94 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2012, PHP 5.4.6
+02 Aug 2012, PHP 5.4.6 RC1
- CLI Server:
. Implemented FR #62700 (have the console output 'Listening on
diff --git a/configure.in b/configure.in
index 1e80689922..b52fbf5e7d 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=4
-PHP_RELEASE_VERSION=5
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=6
+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 4b7709c552..06a924ec3a 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 4
-#define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.5-dev"
+#define PHP_RELEASE_VERSION 6
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.4.6RC1"
#define PHP_VERSION_ID 50405