summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-10-20 06:05:30 +0000
committerStanislav Malyshev <stas@php.net>2011-10-20 06:05:30 +0000
commit91a04638e6cb5f90b561196c36d69b503a00d1e7 (patch)
tree9c00ab6b1b58405610eeb460dffd6df717adb68c
parent380a1ea142884b8b57584ce1e37c8d08d408c57e (diff)
downloadphp-git-91a04638e6cb5f90b561196c36d69b503a00d1e7.tar.gz
5.4.0beta2
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index c3e2340ea9..e9a88e3885 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2011, PHP 5.4.0 RC1
+20 Oct 2011, PHP 5.4.0 beta2
- General improvements:
. Improve the warning message of incompatible arguments. (Laruence)
. Improve ternary operator performance when returning arrays. (Arnaud, Dmitry)
@@ -51,7 +51,7 @@ PHP NEWS
- Fileinfo:
. Fixed bug #60094 (C++ comment fails in c89). (Laruence)
-15 Sep 2011, PHP 5.4.0 Beta
+15 Sep 2011, PHP 5.4.0 Beta1
- General improvements:
. Added callable typehint. (Hannes)
. Implemented closure rebinding as parameter to bindTo. (Gustavo Lopes)
diff --git a/configure.in b/configure.in
index 97c9ab0a31..edaf2d40d4 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=0
-PHP_EXTRA_VERSION="beta2-dev"
+PHP_EXTRA_VERSION="beta2"
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 618261fe09..4c51d70fdf 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 0
-#define PHP_EXTRA_VERSION "beta2-dev"
-#define PHP_VERSION "5.4.0beta2-dev"
+#define PHP_EXTRA_VERSION "beta2"
+#define PHP_VERSION "5.4.0beta2"
#define PHP_VERSION_ID 50400