From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 19 Nov 2020 15:28:27 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8fb9dc8b7c0a2e68f629e02b5e55b23f4e00ee;p=php

Merge branch 'PHP-8.0'

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

dc8fb9dc8b7c0a2e68f629e02b5e55b23f4e00ee
diff --cc win32/build/confutils.js
index 1871e582ab,bf88cdae44..31314ffd95
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -92,12 -92,14 +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 = 1;
- var PHP_RELEASE_VERSION = 0;
- var PHP_EXTRA_VERSION = "";
- var PHP_VERSION_STRING = "8.1.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_MINOR_VERSION = 1;
+ 	var PHP_RELEASE_VERSION = 0;
+ 	var PHP_EXTRA_VERSION = "";
 -	var PHP_VERSION_STRING = "8.0.0";
++	var PHP_VERSION_STRING = "8.1.0";
+ }
  
  /* Get version numbers and DEFINE as a string */
  function get_version_numbers()