summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyra3l@gmail.com>2017-07-06 00:05:14 +0200
committerFerenc Kovacs <tyra3l@gmail.com>2017-07-06 00:05:14 +0200
commit7991a88675a2a1d8a7683f88b301b11080b4093d (patch)
tree019a6bcfddea0351efdaba8c3c3b4378513c5604
parent55b880070c55cde810f6fb89cda5c8b405cc95ca (diff)
downloadphp-git-7991a88675a2a1d8a7683f88b301b11080b4093d.tar.gz
move NEWS entry to the correct place, also bump the version
-rw-r--r--NEWS10
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 11 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 432cc80283..b69d04f37c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? 2017, PHP 5.6.31
+?? ?? 2017, PHP 5.6.32
+
+06 Jul 2017, PHP 5.6.31
- Core:
. Fixed bug #73807 (Performance problem with processing post request over
@@ -15,6 +17,10 @@ PHP NEWS
GD:
. Fixed bug #74435 (Buffer over-read into uninitialized memory). (cmb)
+mbstring:
+ . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
+ CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
+
OpenSSL:
. Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()).
(Stas)
@@ -259,8 +265,6 @@ WDDX:
. Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
. Fixed bug #72910 (Out of bounds heap read in mbc_to_code() / triggered by
mb_ereg_match()). (Stas)
- . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
- CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
- MSSQL:
. Fixed bug #72039 (Use of uninitialised value on mssql_guid_string). (Kalle)
diff --git a/configure.in b/configure.in
index 33c771428c..5813b5b8ff 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=6
-PHP_RELEASE_VERSION=31
+PHP_RELEASE_VERSION=32
PHP_EXTRA_VERSION="-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 becb2f7730..3237383da1 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 6
-#define PHP_RELEASE_VERSION 31
+#define PHP_RELEASE_VERSION 32
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.31-dev"
-#define PHP_VERSION_ID 50631
+#define PHP_VERSION "5.6.32-dev"
+#define PHP_VERSION_ID 50632