From e3034dba3e7fd1cd571e2f49336d245e6fd554af Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Mon, 29 Aug 2022 22:44:53 +0100
Subject: [PATCH] Fix FPM tester conflict

---
 sapi/fpm/tests/tester.inc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
index 8f2e9f7b189..71bafcb3bb6 100644
--- a/sapi/fpm/tests/tester.inc
+++ b/sapi/fpm/tests/tester.inc
@@ -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');