summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-05-07 12:01:10 -0700
committerStanislav Malyshev <stas@php.net>2012-05-07 12:01:10 -0700
commit64170aa3a564331c22c8647e067b22cb274f6601 (patch)
tree2d939ecdd3cceabb749a2b51ee2cbe94c6c8a356
parent32246bf50749709a9f99feda09088181598e5121 (diff)
downloadphp-git-64170aa3a564331c22c8647e067b22cb274f6601.tar.gz
prep for 5.4.3
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 11 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index de1e55f6c0..a41a5d178a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-03 Mar 2012, PHP 5.4.2
+08 May 2012, PHP 5.4.3
+
+- CGI
+ . Re-Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823.
+ (Stas)
+
+03 May 2012, PHP 5.4.2
- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
diff --git a/configure.in b/configure.in
index 2470856382..1776a5ad40 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=2
+PHP_RELEASE_VERSION=3
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 e609c7ac01..46fba13293 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 2
+#define PHP_RELEASE_VERSION 3
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.4.2"
-#define PHP_VERSION_ID 50402
+#define PHP_VERSION "5.4.3"
+#define PHP_VERSION_ID 50403