php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

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