Merge branch 'PHP-8.1'

Author: bukka

sapi/fpm/tests/proc-idle-timeout.phpt

@@ -4,7 +4,6 @@ FPM: Process manager config pm.process_idle_timeout
 <?php
 include "skipif.inc";
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-echo "skip Test fails in CI\n";
 ?>
 --FILE--
 <?php
@@ -24,18 +23,18 @@ EOT;
 
 $code = <<<EOT
 <?php
-usleep(200);
+usleep(300000);
 EOT;
 
 $tester = new FPM\Tester($cfg, $code);
 $tester->start();
 $tester->expectLogStartNotices();
-$tester->multiRequest(2);
+$tester->multiRequest(2, null, null, null, false, 7000);
 $tester->status([
     'total processes' => 2,
 ]);
 // wait for process idle timeout
-sleep(6);
+sleep(5);
 $tester->status([
     'total processes' => 1,
 ]);

sapi/fpm/tests/tester.inc

@@ -624,6 +624,7 @@ class Tester
      * @param string|null $successMessage
      * @param string|null $errorMessage
      * @param bool $connKeepAlive
+     * @param int $readTimeout
      * @return Response[]
      * @throws \Exception
      */
@@ -632,7 +633,8 @@ class Tester
         string $address = null,
         string $successMessage = null,
         string $errorMessage = null,
-        bool $connKeepAlive = false
+        bool $connKeepAlive = false,
+        int $readTimeout = 0
     ) {
         if ($this->hasError()) {
             return new Response(null, true);
@@ -658,8 +660,8 @@ class Tester
                 ];
             }, $requests);
 
-            $responses = array_map(function ($conn) {
-                $response = new Response($conn['client']->wait_for_response_data($conn['requestId']));
+            $responses = array_map(function ($conn) use ($readTimeout) {
+                $response = new Response($conn['client']->wait_for_response_data($conn['requestId'], $readTimeout));
                 if ($this->debug) {
                     $response->debugOutput();
                 }