com php-src: Prepare 7.3.6RC1: NEWS Zend/zend.h configure.acmain/php_version.h

  106180
May 14, 2019 09:37 cmb@php.net (Christoph Michael Becker)
Commit:    40235e7eefb7057c2d41e3d86dc8f0dfb2e8b3e0
Author:    Christoph M. Becker <cmb@php.net>         Tue, 14 May 2019 09:37:40 +0000
Parents:   1a98878bfe5c8907429c1f7fa3505d5eec45189b
Branches:  PHP-7.3.6

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=40235e7eefb7057c2d41e3d86dc8f0dfb2e8b3e0

Log:
Prepare 7.3.6RC1

Changed paths:
  M  NEWS
  M  Zend/zend.h
  M  configure.ac
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 98c06eb..11d2ae2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.3.6
+16 May 2019, PHP 7.3.6RC1
 
 - cURL:
   . Implemented FR #72189 (Add missing CURL_VERSION_* constants). (Javier
diff --git a/Zend/zend.h b/Zend/zend.h
index 3814323..fb4a6bf 100644
--- a/Zend/zend..h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.3.6-dev"
+#define ZEND_VERSION "3.3.6RC1"
 
 #define ZEND_ENGINE_3
 
diff --git a/configure.ac b/configure.ac
index 861042d..75b96d7 100644
--- a/configure.ac
+++ b/configure..ac
@@ -108,7 +108,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION="RC1"
 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 9ab5a00..a182997 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.3.6-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "7.3.6RC1"
 #define PHP_VERSION_ID 70306
  105710
May 15, 2019 05:42 rasmus@lerdorf.com (Rasmus Lerdorf)
  105711
May 15, 2019 08:06 cmbecker69@gmx.de ("Christoph M. Becker")
On 15.05.2019 at 07:42, Rasmus Lerdorf wrote:


Thanks for the ping!  This looks like an important bug fix, and since it
will be in PHP 7.2.19, it should also be in 7.3.6.

I wonder, though, whether it is safe to have it without an RC, or
whether 7.3.6RC1 should be re-tagged.  Thoughts?

Thanks,
Christoph
  105712
May 15, 2019 08:08 nikita.ppv@gmail.com (Nikita Popov)
On Wed, May 15, 2019 at 10:06 AM Christoph M. Becker <cmbecker69@gmx.de>
wrote:

> On 15.05.2019 at 07:42, Rasmus Lerdorf wrote: > > > Christoph, I think we should merge > > > http://git.php.net/?p=php-src.git;a=commitdiff;h=5c4d125d4c2976236e2ecddd1d8c6e7b113ec482 > > into 7.3.6. > > Thanks for the ping! This looks like an important bug fix, and since it > will be in PHP 7.2.19, it should also be in 7.3.6. > > I wonder, though, whether it is safe to have it without an RC, or > whether 7.3.6RC1 should be re-tagged. Thoughts? >
This is a somewhat tricky change, so I'd recommend re-tagging. Nikita
  105713
May 15, 2019 09:23 cmbecker69@gmx.de ("Christoph M. Becker")
On 15.05.2019 at 10:08, Nikita Popov wrote:

> On Wed, May 15, 2019 at 10:06 AM Christoph M. Becker <cmbecker69@gmx.de> > wrote: > >> On 15.05.2019 at 07:42, Rasmus Lerdorf wrote: >> >>> Christoph, I think we should merge >>> >> http://git.php.net/?p=php-src.git;a=commitdiff;h=5c4d125d4c2976236e2ecddd1d8c6e7b113ec482 >>> into 7.3.6. >> >> Thanks for the ping! This looks like an important bug fix, and since it >> will be in PHP 7.2.19, it should also be in 7.3.6. >> >> I wonder, though, whether it is safe to have it without an RC, or >> whether 7.3.6RC1 should be re-tagged. Thoughts? > > This is a somewhat tricky change, so I'd recommend re-tagging.
Okay, I'm going to re-tag. Thanks, Christoph