Skip to content

Commit 9a98569

Browse files
committed
Pass worker ID to clean scripts
On Windows, reusing/sharing of OPcache instances with different configuration is not necessarily supported, so we have to make that it does not happen for the clean scripts, by using `$orig_ini_settings` instead of `$clean_params`.
1 parent 5d3b7ac commit 9a98569

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

run-tests.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2473,12 +2473,9 @@ function run_test($php, $file, $env)
24732473
save_text($test_clean, trim($section_text['CLEAN']), $temp_clean);
24742474

24752475
if (!$no_clean) {
2476-
$clean_params = array();
2477-
settings2array($ini_overwrites, $clean_params);
2478-
$clean_params = settings2params($clean_params);
24792476
$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
24802477
"unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;" : "";
2481-
system_with_timeout("$extra $php $pass_options $extra_options -q $clean_params $no_file_cache \"$test_clean\"", $env);
2478+
system_with_timeout("$extra $php $pass_options $extra_options -q $orig_ini_settings $no_file_cache \"$test_clean\"", $env);
24822479
}
24832480

24842481
if (!$cfg['keep']['clean']) {

0 commit comments

Comments
 (0)