summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-04-11 22:07:50 -0700
committerStanislav Malyshev <stas@php.net>2012-04-11 22:07:50 -0700
commitfa1437b144683eae4d253473c35e375f7b743811 (patch)
tree03e737253575ef158c29695ea9af419db3a29564
parent61747bd041513f4e7c04fdc4890fbd1a6e76b907 (diff)
downloadphp-git-php-5.4.1RC2.tar.gz
5.4.1RC2php-5.4.1RC2
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 11 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 926844a5ac..d647f8de7c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+11 Apr 2012, PHP 5.4.1 RC2
+
+- Core:
+ . Fixed crash in ZTS using same class in many threads. (Johannes)
+
+- fileinfo:
+ . Fix fileinfo test problems. (Anatoliy Belsky)
+
29 Mar 2012, PHP 5.4.1 RC1
- CLI Server:
diff --git a/configure.in b/configure.in
index 828ce70a56..b0cc63bca7 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=1
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC2"
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 5825b7cf2e..a4d604824d 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 1
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.1RC1"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.4.1RC2"
#define PHP_VERSION_ID 50401