Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION

Author: cmb69

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.0.1RC1
 
+- Core:
+  . Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION).
+    (cmb)
 
 26 Nov 2020, PHP 8.0.0
 

win32/build/confutils.js

@@ -92,12 +92,14 @@ if (typeof(CWD) == "undefined") {
 	CWD = FSO.GetParentFolderName(FSO.GetParentFolderName(FSO.GetAbsolutePathName("main\\php_version.h")));
 }
 
-/* defaults; we pick up the precise versions from configure.ac */
-var PHP_VERSION = 8;
-var PHP_MINOR_VERSION = 0;
-var PHP_RELEASE_VERSION = 0;
-var PHP_EXTRA_VERSION = "";
-var PHP_VERSION_STRING = "8.0.0";
+if (!MODE_PHPIZE) {
+	/* defaults; we pick up the precise versions from configure.ac */
+	var PHP_VERSION = 8;
+	var PHP_MINOR_VERSION = 0;
+	var PHP_RELEASE_VERSION = 0;
+	var PHP_EXTRA_VERSION = "";
+	var PHP_VERSION_STRING = "8.0.0";
+}
 
 /* Get version numbers and DEFINE as a string */
 function get_version_numbers()
@@ -2334,6 +2336,8 @@ function generate_phpize()
 	MF.WriteLine("var PHP_VERSION=" + PHP_VERSION);
 	MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
 	MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
+	MF.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\"");
+	MF.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\"");
 	MF.WriteBlankLines(1);
 	MF.WriteLine("/* Generated extensions list with mode (static/shared) */");
 

win32/build/phpize.js.in

@@ -215,6 +215,12 @@ C.WriteLine("var PHP_ANALYZER = 'disabled';");
 C.WriteLine("var PHP_PGO = 'no';");
 C.WriteLine("var PHP_PGI = 'no';");
 
+C.WriteLine("var PHP_VERSION=" + PHP_VERSION);
+C.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
+C.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
+C.WriteLine("var PHP_EXTRA_VERSION=\"" + PHP_EXTRA_VERSION + "\"");
+C.WriteLine("var PHP_VERSION_STRING=\"" + PHP_VERSION_STRING + "\"");
+
 C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
 if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {
 	C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));