5.4.0beta2

diff --git a/NEWS b/NEWS
index c3e2340ea940612676990e95aa81e6b51fe5ea5a..e9a88e388596ae724f94137ecc583391c6740de4 100644 (file)
--- 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 97c9ab0a31ae6048d283d8f152b002e0ca918976..edaf2d40d423d399e6e8c8515e5e4f7cd7a8ae1f 100644 (file)
--- 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 618261fe0982ad7156c3a54aa46135e619c76e29..4c51d70fdfc4f13b1145e9db1ddbe93272218ccd 100644 (file)
--- 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