summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-03 15:54:59 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-03 15:54:59 +0200
commit03cb63bc1da6344f65a075f25721d29b59670cfe (patch)
treed8773647d11145d3a3978476fd7e4849d6cf6c5f
parent29300b1f9dab068d477b241d8fd872e3a7c829b3 (diff)
downloadphp-git-PHP-5.3.12.tar.gz
-rw-r--r--NEWS3
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index d26ffea8ab..6d95962797 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+03 Mar 2012, PHP 5.3.12
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
26 Apr 2012, PHP 5.3.11
- Core:
diff --git a/configure.in b/configure.in
index a74771e86b..e9cf322ed8 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=11
+PHP_RELEASE_VERSION=12
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 d3037da187..5103b1c435 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 3
-#define PHP_RELEASE_VERSION 11
+#define PHP_RELEASE_VERSION 12
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.3.11"
-#define PHP_VERSION_ID 50311
+#define PHP_VERSION "5.3.12"
+#define PHP_VERSION_ID 50312