Skip to content

Commit

Permalink
Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
Browse files Browse the repository at this point in the history
It does not make sense to make assumptions about `PHP_CONFIG_FILE_PATH`
during build time, since that value is never used during run time on
Windows.  Since there is no `--with-config-file-path` on Windows
either, we define `PHP_CONFIG_FILE_PATH` as `""`.
  • Loading branch information
cmb69 committed Jul 23, 2020
1 parent 6b99a8b commit 15efb96
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.22

- Core:
. Fixed bug #79884 (PHP_CONFIG_FILE_PATH is meaningless). (cmb)

?? ??? ????, PHP 7.3.21

- Apache:
Expand Down
2 changes: 1 addition & 1 deletion win32/build/config.w32.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand Down

0 comments on commit 15efb96

Please sign in to comment.