summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-12-22 03:27:00 +0000
committerStanislav Malyshev <stas@php.net>2011-12-22 03:27:00 +0000
commit48a688ffa055978c38c7d91bf42c39da39cc791e (patch)
tree285cb6ac6cfd6ae9d6d52c2de497b5d6323a029b
parent1a79692791cf1d92f712ba59cc4d148ad3a7b496 (diff)
downloadphp-git-48a688ffa055978c38c7d91bf42c39da39cc791e.tar.gz
back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index db5c9e4fe4..d2bf4299ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Jan 2012, PHP 5.4.0 RC5
+
22 Dec 2011, PHP 5.4.0 RC4
- Core:
. Added max_input_vars directive to prevent attacks based on hash collisions
diff --git a/configure.in b/configure.in
index 1583f48d29..e0affc6def 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"
+PHP_EXTRA_VERSION="RC5-dev"
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 4319570d27..82717a6700 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"
-#define PHP_VERSION "5.4.0RC4"
+#define PHP_EXTRA_VERSION "RC5-dev"
+#define PHP_VERSION "5.4.0RC5-dev"
#define PHP_VERSION_ID 50400