summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-08 11:22:27 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-08 11:22:27 +0200
commite9354b53665e2d313f07d48ce3d227cc61a068dc (patch)
tree6a6cdb5c6d5c911b9aa62eb7365845a038093fea
parent46d9cc3de9f2def8ab84d0b83cc89b6f85d7506a (diff)
downloadphp-git-PHP-5.3.13.tar.gz
-rw-r--r--NEWS7
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 6d95962797..124054e548 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-03 Mar 2012, PHP 5.3.12
+08 May 2012, PHP 5.3.13
+- CGI
+ . Improve fix for PHP-CGI query string parameter vulnerability, CVE-2012-2311.
+ (Stas)
+
+03 May 2012, PHP 5.3.12
- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
26 Apr 2012, PHP 5.3.11
diff --git a/configure.in b/configure.in
index e9cf322ed8..f8241e66b0 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=12
+PHP_RELEASE_VERSION=13
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 5103b1c435..f4753a2441 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -4,5 +4,5 @@
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 12
#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.3.12"
-#define PHP_VERSION_ID 50312
+#define PHP_VERSION "5.3.13"
+#define PHP_VERSION_ID 50313