summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-12-22 03:25:28 +0000
committerStanislav Malyshev <stas@php.net>2011-12-22 03:25:28 +0000
commit1a79692791cf1d92f712ba59cc4d148ad3a7b496 (patch)
tree2a4a44fe9086e53aa611156a4b39e922f32e0a5a
parent0610ca459a8b4bd6c5ef1c70dfd8b5198c0e8253 (diff)
downloadphp-git-1a79692791cf1d92f712ba59cc4d148ad3a7b496.tar.gz
5.4.0rc4
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 79c2f2f2ac..db5c9e4fe4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Dec 2011, PHP 5.4.0 RC4
+22 Dec 2011, PHP 5.4.0 RC4
- Core:
. Added max_input_vars directive to prevent attacks based on hash collisions
(Dmitry).
diff --git a/configure.in b/configure.in
index df3ddb05de..1583f48d29 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="RC4-dev"
+PHP_EXTRA_VERSION="RC4"
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 3d48e096fb..4319570d27 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 "RC4-dev"
-#define PHP_VERSION "5.4.0RC4-dev"
+#define PHP_EXTRA_VERSION "RC4"
+#define PHP_VERSION "5.4.0RC4"
#define PHP_VERSION_ID 50400