Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit 3deb6b555a6b · 2020-07-23T15:41:20.000+02:00
* PHP-7.3:
  Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2020, PHP 7.4.10
 
+- Core:
+  . Fixed bug #79884 (PHP_CONFIG_FILE_PATH is meaningless). (cmb)
+
 06 Aug 2020, PHP 7.4.9
 
 - Apache:
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
@@ -9,7 +9,7 @@
 #define NTDDI_VERSION 0x06010000
 
 /* Default PHP / PEAR directories */
-#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot")?getenv("SystemRoot"):"")
+#define PHP_CONFIG_FILE_PATH ""
 #define CONFIGURATION_FILE_PATH "php.ini"
 #define PEAR_INSTALLDIR "@PREFIX@\\pear"
 #define PHP_BINDIR "@PREFIX@"
