summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2012-05-03 18:58:52 +0200
committerDavid Soria Parra <dsp@php.net>2012-05-03 19:10:43 +0200
commit32246bf50749709a9f99feda09088181598e5121 (patch)
tree7b2ae1b0808365928f0a7236ec79f097b9c9e22b
parent55869a95ab75c0eb99c57201bfeccaef57e0d36d (diff)
downloadphp-git-PHP-5.4.2.tar.gz
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 5468348795..de1e55f6c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+03 Mar 2012, PHP 5.4.2
+
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
26 Apr 2012, PHP 5.4.1
- CLI Server:
diff --git a/configure.in b/configure.in
index e081ae46d7..2470856382 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=1
+PHP_RELEASE_VERSION=2
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 585c84ed7d..e609c7ac01 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 1
+#define PHP_RELEASE_VERSION 2
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.4.1"
-#define PHP_VERSION_ID 50401
+#define PHP_VERSION "5.4.2"
+#define PHP_VERSION_ID 50402