Improve keep alive handling and setting fcgi transport in FPM tester

Author: bukka

sapi/fpm/tests/fcgi.inc

@@ -104,6 +104,11 @@ class StreamTransport implements Transport
      */
     private $stream = null;
 
+    /**
+     * @var bool
+     */
+    private bool $keepAlive = false;
+
     /**
      * @inheritDoc
      */
@@ -123,6 +128,10 @@ class StreamTransport implements Transport
         if (!$this->stream) {
             throw new TransportException('Unable to connect to FastCGI application: ' . $errstr);
         }
+
+        if ($this->keepAlive) {
+            $this->setKeepAlive(true);
+        }
     }
 
     /**
@@ -145,6 +154,10 @@ class StreamTransport implements Transport
      */
     public function setKeepAlive(bool $keepAlive): void
     {
+        $this->keepAlive = $keepAlive;
+        if (!$this->stream) {
+            return;
+        }
         if ($keepAlive) {
             $socket = socket_import_stream($this->stream);
             if ($socket) {
@@ -219,9 +232,14 @@ class SocketTransport implements Transport
     private ?\Socket $socket = null;
 
     /**
-     * @inheritDoc
+     * @var int
+     */
+    protected int $dataTimeoutMs = 5000;
+
+    /**
+     * @var bool
      */
-    protected int $dataTimeoutMs;
+    private bool $keepAlive = false;
 
     /**
      * @inheritDoc
@@ -242,6 +260,10 @@ class SocketTransport implements Transport
             $error = socket_strerror(socket_last_error($this->socket));
             throw new TransportException('Unable to connect to FastCGI application: ' . $error);
         }
+
+        if ($this->keepAlive) {
+            $this->setKeepAlive(true);
+        }
     }
 
     /**
@@ -258,6 +280,7 @@ class SocketTransport implements Transport
      */
     public function setKeepAlive(bool $keepAlive): void
     {
+        $this->keepAlive = $keepAlive;
         if (!$this->socket) {
             return;
         }

sapi/fpm/tests/tester.inc

@@ -65,6 +65,11 @@ class Tester
      */
     private array $clients = [];
 
+    /**
+     * @var string
+     */
+    private string $clientTransport;
+
     /**
      * @var LogReader
      */
@@ -355,15 +360,17 @@ class Tester
         string $code = '',
         array $options = [],
         string $fileName = null,
-        bool $debug = null
+        bool $debug = null,
+        string $clientTransport = 'stream'
     ) {
-        $this->configTemplate = $configTemplate;
-        $this->code           = $code;
-        $this->options        = $options;
-        $this->fileName       = $fileName ?: self::getCallerFileName();
-        $this->debug          = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
-        $this->logReader      = new LogReader($this->debug);
-        $this->logTool        = new LogTool($this->logReader, $this->debug);
+        $this->configTemplate  = $configTemplate;
+        $this->code            = $code;
+        $this->options         = $options;
+        $this->fileName        = $fileName ?: self::getCallerFileName();
+        $this->debug           = $debug !== null ? $debug : (bool)getenv('TEST_FPM_DEBUG');
+        $this->logReader       = new LogReader($this->debug);
+        $this->logTool         = new LogTool($this->logReader, $this->debug);
+        $this->clientTransport = $clientTransport;
     }
 
     /**
@@ -894,7 +901,7 @@ class Tester
      *
      * @return Client
      */
-    private function getClient(string $address = null, $keepAlive = false): Client
+    private function getClient(string $address = null, bool $keepAlive = false): Client
     {
         $address = $address ? $this->processTemplate($address) : $this->getAddr();
         if ($address[0] === '/') { // uds
@@ -916,11 +923,11 @@ class Tester
         }
 
         if ( ! $keepAlive) {
-            return new Client($host, $port);
+            return new Client($host, $port, $this->clientTransport);
         }
 
         if ( ! isset($this->clients[$host][$port])) {
-            $client = new Client($host, $port);
+            $client = new Client($host, $port, $this->clientTransport);
             $client->setKeepAlive(true);
             $this->clients[$host][$port] = $client;
         }