From 89dc78e0f0c1a4f27b889f232b109a3919ecf478 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Tue, 27 Aug 2019 23:29:58 +0200
Subject: Prepare PHP 7.3.9

---
 NEWS               | 16 ++++++----------
 Zend/zend.h        |  2 +-
 configure.ac       |  2 +-
 main/php_version.h |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 7062b454b7..6115a9960c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,12 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Aug 2019, PHP 7.3.9
-
-- Core:
-  . Fixed bug #78412 (Generator incorrectly reports non-releasable $this as GC
-    child). (Nikita)
-
-- MBString:
-  . Fixed bug #78380 (Oniguruma 6.9.3 fixes CVEs). (CVE-2019-13224) (Stas)
-
-15 Aug 2019, PHP 7.3.9RC1
+29 Aug 2019, PHP 7.3.9
 
 - Core:
   . Fixed bug #78363 (Buffer overflow in zendparse). (Nikita)
   . Fixed bug #78379 (Cast to object confuses GC, causes crash). (Dmitry)
+  . Fixed bug #78412 (Generator incorrectly reports non-releasable $this as GC
+    child). (Nikita)
 
 - Curl:
   . Fixed bug #77946 (Bad cURL resources returned by curl_multi_info_read()).
@@ -34,6 +27,9 @@ PHP                                                                        NEWS
 - LiteSpeed:
   . Updated to LiteSpeed SAPI V7.5 (Fixed clean shutdown). (George Wang)
 
+- MBString:
+  . Fixed bug #78380 (Oniguruma 6.9.3 fixes CVEs). (CVE-2019-13224) (Stas)
+
 - MySQLnd:
   . Fixed bug #78179 (MariaDB server version incorrectly detected). (cmb)
   . Fixed bug #78213 (Empty row pocket). (cmb)
diff --git a/Zend/zend.h b/Zend/zend.h
index 65083aded5..68e6d6820a 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.3.9RC1"
+#define ZEND_VERSION "3.3.9"
 
 #define ZEND_ENGINE_3
 
diff --git a/configure.ac b/configure.ac
index 5e6fba0b6c..185ff6b1e9 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=9
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
 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 77db4ce1cf..cd6db1bf2d 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 9
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "7.3.9RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.3.9"
 #define PHP_VERSION_ID 70309
-- 
cgit v1.2.1