From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 17 Mar 2016 00:46:00 +0000 (+0100)
Subject: prepare for 5.6.20RC1
X-Git-Tag: php-5.6.21RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14f4848fb0e900c34129eead3c9ca92157b23aac;p=php

prepare for 5.6.20RC1
---

diff --git a/NEWS b/NEWS
index a17b6015c4..40b8c7d8ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.20
+?? ??? 2016, PHP 5.6.21
+
+31 Marc 2016, PHP 5.6.20
 
 - CLI Server:
   . Fixed bug #69953 (Support MKCALENDAR request method). (Christoph)
diff --git a/configure.in b/configure.in
index 08b870f1d5..631a0eeb99 100644
--- a/configure.in
+++ b/configure.in
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=6
-PHP_RELEASE_VERSION=19
-PHP_EXTRA_VERSION="RC1"
+PHP_RELEASE_VERSION=21
+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 cb8b9abbe3..d1c3f04202 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_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.19RC1"
-#define PHP_VERSION_ID 50619
+#define PHP_RELEASE_VERSION 21
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.6.21-dev"
+#define PHP_VERSION_ID 50621