Skip to content

Commit

Permalink
Fixed #73124: php_ini_scanned_files()
Browse files Browse the repository at this point in the history
Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.
  • Loading branch information
johnstevenson authored and nikic committed Nov 28, 2017
1 parent 8b57a5b commit 6ed242d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ PHP NEWS
segment fault). (Nikita)
. Fixed bug #75409 (accept EFAULT in addition to ENOSYS as indicator
that getrandom() is missing). (sarciszewski)
. Fixed bug #73124 (php_ini_scanned_files() not reporting correctly).
(John Stevenson)

- Zip:
. Fixed bug #75540 (Segfault with libzip 1.3.1). (Remi)
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/info.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ PHP_FUNCTION(php_ini_scanned_files)
return;
}

if (strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
if (php_ini_scanned_files) {
RETURN_STRING(php_ini_scanned_files);
} else {
RETURN_FALSE;
Expand Down
24 changes: 24 additions & 0 deletions ext/standard/tests/bug73124.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
Bug #73124 (php_ini_scanned_files relied on PHP_CONFIG_FILE_SCAN_DIR)
--SKIPIF--
<?php
if (!empty(PHP_CONFIG_FILE_SCAN_DIR)) die("Skip: PHP_CONFIG_FILE_SCAN_DIR must not be available");
?>
--FILE--
<?php
$tempDir = sys_get_temp_dir();
putenv('PHP_INI_SCAN_DIR='.$tempDir);

$inifile = $tempDir.DIRECTORY_SEPARATOR.'scan-dir.ini';
@unlink($inifile);
file_put_contents($inifile, "\n");

$php = getenv('TEST_PHP_EXECUTABLE');
passthru('"'.$php.'" -r "print_r(php_ini_scanned_files());"');

putenv('PHP_INI_SCAN_DIR=');
@unlink($inifile);
?>
--EXPECTREGEX--
.*[\/\\]scan-dir\.ini.*|.*[\/\\]scan-dir\.ini
Done

0 comments on commit 6ed242d

Please sign in to comment.