diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-23 15:40:48 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-23 15:41:20 +0200 |
| commit | 3deb6b555a6bf3578116f328a132644888ff8b68 (patch) | |
| tree | b6537e73f5163d0acfc5f075c7c134daba2b95e8 | |
| parent | 0a59a719476ed916da144a6c2743976c217660c4 (diff) | |
| parent | 15efb96d4ce8003cca1c5fdcda4488c1827065d4 (diff) | |
| download | php-git-3deb6b555a6bf3578116f328a132644888ff8b68.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 index 36a45fb76c..5c093f5f86 100644 --- 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@" |