archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix FPM tester conflict

Browse source
This commit is contained in:
Jakub Zelenka 2022-08-29 22:44:53 +01:00
parent f3c357c446
commit e3034dba3e
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -619,12 +619,9 @@ class Tester
string $errorMessage = null, string $errorMessage = null,
bool $connKeepAlive = false, bool $connKeepAlive = false,
string $scriptFilename = null, string $scriptFilename = null,
<<<<<<< HEAD string $stdin = null,
string $stdin = null
=======
bool $expectError = false, bool $expectError = false,
int $readLimit = -1, int $readLimit = -1,
>>>>>>> PHP-8.1
) { ) {
if ($this->hasError()) { if ($this->hasError()) {
return new Response(null, true); return new Response(null, true);
@ -634,11 +631,7 @@ class Tester
try { try {
$this->response = new Response( $this->response = new Response(
<<<<<<< HEAD $this->getClient($address, $connKeepAlive)->request_data($params, $stdin, $readLimit)
$this->getClient($address, $connKeepAlive)->request_data($params, $stdin)
=======
$this->getClient($address, $connKeepAlive)->request_data($params, false, $readLimit)
>>>>>>> PHP-8.1
); );
if ($expectError) { if ($expectError) {
$this->error('Expected request error but the request was successful'); $this->error('Expected request error but the request was successful');