summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-04-24 09:47:33 -0700
committerStanislav Malyshev <stas@php.net>2012-04-24 09:47:33 -0700
commit02db9931c8ccbe7ab0b4adb9af44577c27213eeb (patch)
tree22ba8977c4ddf258dff4cbafc57d2b3f95f34b8b
parent07679e98d6f28a8a71e27ead479ae65a72c0d58d (diff)
downloadphp-git-PHP-5.4.1.tar.gz
-rw-r--r--NEWS14
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 8 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index d647f8de7c..5468348795 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,6 @@
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
+26 Apr 2012, PHP 5.4.1
- CLI Server:
. Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
@@ -17,6 +9,7 @@ PHP NEWS
. "Connection: close" instead of "Connection: closed" (Gustavo)
- Core:
+ . Fixed crash in ZTS using same class in many threads. (Johannes)
. Fixed bug #61374 (html_entity_decode tries to decode code points that don't
exist in ISO-8859-1). (Gustavo)
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
@@ -48,6 +41,9 @@ PHP NEWS
function is by reference). (Nikita Popov)
. Improve performance of set_exception_handler while doing reset (Laruence)
+- fileinfo:
+ . Fix fileinfo test problems. (Anatoliy Belsky)
+
- FPM
. Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
(michaelhood at gmail dot com, Ilia)
diff --git a/configure.in b/configure.in
index b0cc63bca7..e081ae46d7 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="RC2"
+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 a4d604824d..585c84ed7d 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 "RC2"
-#define PHP_VERSION "5.4.1RC2"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.1"
#define PHP_VERSION_ID 50401