From 132749122426ee21171b2b3caccfaf86e24b4adf Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 8 Apr 2020 17:10:20 +0200
Subject: Add php_cli_server_connect() helper

To encapsulate the repeated fsockopen() code.

This gives us a chance to control the timeout in one place:
Raise it to one second.
---
 sapi/cli/tests/php_cli_server.inc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'sapi/cli/tests/php_cli_server.inc')

diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index 679a55eed4..d5f28cbb54 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -1,7 +1,7 @@
 <?php
-define ("PHP_CLI_SERVER_HOSTNAME", "localhost");
-define ("PHP_CLI_SERVER_PORT", 8964);
-define ("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT);
+define("PHP_CLI_SERVER_HOSTNAME", "localhost");
+define("PHP_CLI_SERVER_PORT", 8964);
+define("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT);
 
 function php_cli_server_start(
 	?string $code = 'echo "Hello world";',
@@ -96,4 +96,14 @@ php_cli_server_start_error:
 
     return $handle;
 }
+
+function php_cli_server_connect() {
+    $timeout = 1.0;
+    $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, $timeout);
+    if (!$fp) {
+        die("connect failed");
+    }
+    return $fp;
+}
+
 ?>
-- 
cgit v1.2.1