From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Fri, 6 Jan 2017 00:43:11 +0000 (+0100)
Subject: 5.6.31 is next
X-Git-Tag: php-5.6.30RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b14d7b84b10cef43034de0106bbfce34204100e;p=php

5.6.31 is next
---

diff --git a/NEWS b/NEWS
index 0bb1e67723..8e043ec553 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ?? 2017, PHP 5.6.30
+?? ?? 2017, PHP 5.6.31
+
+19 Jan 2017, PHP 5.6.30
+
+- EXIF:
+  . Fixed bug #73737 (FPE when parsing a tag format). (Stas)
 
 - GD:
   . Fixed bug #73549 (Use after free when stream is passed to imagepng). (cmb)
@@ -9,6 +14,11 @@ PHP                                                                        NEWS
   . Fixed bug #68447 (grapheme_extract take an extra trailing character). 
     (SATŌ Kentarō)
 
+- Phar:
+  . Fixed bug #73764 (Crash while loading hostile phar archive). (Stas)
+  . Fixed bug #73768 (Memory corruption when loading hostile phar). (Stas)
+  . Fixed bug #73773 (Seg fault when loading hostile phar). (Stas)
+
 - SQLite3:
   . Reverted fix for bug #73530	(Unsetting result set may reset other result
     set). (cmb)
@@ -16,6 +26,8 @@ PHP                                                                        NEWS
 - Standard:
   . Fixed bug #70213 (Unserialize context shared on double class lookup).
     (Taoguang Chen)
+  . Fixed bug #73825 (Heap out of bounds read on unserialize in
+    finish_nested_data()). (Stas)
 
 08 Dec 2016, PHP 5.6.29
 
diff --git a/configure.in b/configure.in
index c626a28f13..33c771428c 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=30
+PHP_RELEASE_VERSION=31
 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 2aa8db435e..becb2f7730 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 30
+#define PHP_RELEASE_VERSION 31
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.30-dev"
-#define PHP_VERSION_ID 50630
+#define PHP_VERSION "5.6.31-dev"
+#define PHP_VERSION_ID 50631