From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 17 Feb 2016 23:31:18 +0000 (+0100)
Subject: 5.6.20 is next
X-Git-Tag: php-5.6.19RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4762ed4d27429ee9c6a11303300de47546ca3a4d;p=php

5.6.20 is next
---

diff --git a/NEWS b/NEWS
index eb4329215e..041fa6af0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,17 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.19
+?? ??? 2016, PHP 5.6.20
 
-- CURL:
-  . Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes
-    while curl_multi_exec). (Laruence)
+03 Mar 2016, PHP 5.6.19
 
 - CLI server:
   . Fixed bug #71559 (Built-in HTTP server, we can download file in web by bug).
     (Johannes, Anatol)
 
+- CURL:
+  . Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes
+    while curl_multi_exec). (Laruence)
+
 - Date:
   . Fixed bug #68078 (Datetime comparisons ignore microseconds). (Willem-Jan
     Zijderveld)
diff --git a/configure.in b/configure.in
index 9c5175b75b..ee819eb376 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=19
+PHP_RELEASE_VERSION=20
 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 e306c0a566..8173dd0546 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 19
+#define PHP_RELEASE_VERSION 20
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.19-dev"
-#define PHP_VERSION_ID 50619
+#define PHP_VERSION "5.6.20-dev"
+#define PHP_VERSION_ID 50620