From fe3d53f4437718fad63850695970dddd63144af5 Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Tue, 24 Apr 2018 23:23:14 +0200
Subject: 5.6.37 will be next

---
 NEWS               | 18 +++++++++++++++++-
 configure.in       |  2 +-
 main/php_version.h |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index db5523c98d..6fab7d8d74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,22 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2018, PHP 5.6.36
+?? ??? 2018, PHP 5.6.37
+
+26 Apr 2018 PHP 5.6.36
+
+- Exif:
+  . Fixed bug #76130 (Heap Buffer Overflow (READ: 1786) in exif_iif_add_value).
+  (Stas)
+
+- iconv:
+  . Fixed bug #76249 (stream filter convert.iconv leads to infinite loop on
+    invalid sequence). (Stas)
+
+- LDAP:
+  . Fixed bug #76248 (Malicious LDAP-Server Response causes Crash). (Stas)
+
+- Phar:
+  . Fixed bug #76129 (fix for CVE-2018-5712 may not be complete). (Stas)
 
 29 Mar 2018, PHP 5.6.35
 
diff --git a/configure.in b/configure.in
index 23dc5e79a5..ca8f0ed37a 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=36
+PHP_RELEASE_VERSION=37
 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 cec53e0cc9..de645bb78c 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 36
+#define PHP_RELEASE_VERSION 37
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.36-dev"
-#define PHP_VERSION_ID 50636
+#define PHP_VERSION "5.6.37-dev"
+#define PHP_VERSION_ID 50637
-- 
cgit v1.2.1