archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source
This commit is contained in:
Jakub Zelenka 2022-11-13 19:06:10 +00:00
commit b8c1b5e9fa
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/fpm/tests/bug77780-header-sent-error.phpt
View file

@ -24,7 +24,7 @@ echo str_repeat('asdfghjkl', 150000) . "\n";
EOT; EOT;
$tester = new FPM\Tester($cfg, $code); $tester = new FPM\Tester($cfg, $code);
$tester->start(); $tester->start(extensions: ['session']);
$tester->expectLogStartNotices(); $tester->expectLogStartNotices();
$tester $tester
->request( ->request(

17
sapi/fpm/tests/tester.inc
View file

@ -379,12 +379,17 @@ class Tester
* @param array $extraArgs Command extra arguments. * @param array $extraArgs Command extra arguments.
* @param bool $forceStderr Whether to output to stderr so error log is used. * @param bool $forceStderr Whether to output to stderr so error log is used.
* @param bool $daemonize Whether to start FPM daemonized * @param bool $daemonize Whether to start FPM daemonized
* @param array $extensions List of extension to add if shared build used.
* *
* @return bool * @return bool
* @throws \Exception * @throws \Exception
*/ */
public function start(array $extraArgs = [], bool $forceStderr = true, bool $daemonize = false) public function start(
{ array $extraArgs = [],
bool $forceStderr = true,
bool $daemonize = false,
array $extensions = []
) {
$configFile = $this->createConfig(); $configFile = $this->createConfig();
$desc = $this->outDesc ? [] : [1 => array('pipe', 'w'), 2 => array('redirect', 1)]; $desc = $this->outDesc ? [] : [1 => array('pipe', 'w'), 2 => array('redirect', 1)];
@ -399,6 +404,14 @@ class Tester
$cmd[] = '-F'; $cmd[] = '-F';
} }
$extensionDir = getenv('TEST_FPM_EXTENSION_DIR');
if ($extensionDir) {
$cmd[] = '-dextension_dir=' . $extensionDir;
foreach ($extensions as $extension) {
$cmd[] = '-dextension=' . $extension;
}
}
if (getenv('TEST_FPM_RUN_AS_ROOT')) { if (getenv('TEST_FPM_RUN_AS_ROOT')) {
$cmd[] = '--allow-to-run-as-root'; $cmd[] = '--allow-to-run-as-root';
} }