Merge branch 'PHP-7.4'

* PHP-7.4:
  Add php_cli_server_connect() helper

diff --cc sapi/cli/tests/bug43177.phpt
index f36019ba6bf4d74f69e297369d6266668709c838,2ab08228b918934743c8ea9b7fb77e04bf3892fa..6c734e476ab4db30bd4b7d133ae1f0c6e00e1461
--- 1/sapi/cli/tests/bug43177.phpt
--- 2/sapi/cli/tests/bug43177.phpt
+++ b/sapi/cli/tests/bug43177.phpt
@@@ -35,16 -35,11 +35,11 @@@ php_cli_server_start(<<<'SCRIPT
  SCRIPT
  );
  
- list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
- $port = intval($port)?:80;
+ $host = PHP_CLI_SERVER_HOSTNAME;
  
  foreach(array("parse", "fatal", "fatal2", "compile") as $url) {
-     $fp = fsockopen($host, $port, $errno, $errstr, 0.5);
-     if (!$fp) {
-         die("connect failed");
-     }
- 
+     $fp = php_cli_server_connect();
 -      if(fwrite($fp, <<<HEADER
 +    if(fwrite($fp, <<<HEADER
  GET /$url HTTP/1.1
  Host: {$host}
  

diff --cc sapi/cli/tests/bug65066_100.phpt
Simple merge

diff --cc sapi/cli/tests/bug65066_422.phpt
Simple merge

diff --cc sapi/cli/tests/bug65066_511.phpt
Simple merge

diff --cc sapi/cli/tests/bug66606_2.phpt
Simple merge

diff --cc sapi/cli/tests/bug70470.phpt
Simple merge

diff --cc sapi/cli/tests/bug71005.phpt
Simple merge

diff --cc sapi/cli/tests/emptyheader.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server.inc
index 5767e114ca8a98a90aecb26fc62d0a94aff2dfec,d5f28cbb54ca0e1a868617ac6f41bcee5a3883c7..4cf8705a333fd06b44580fe4d33b0899a65b9583
--- 1/sapi/cli/tests/php_cli_server.inc
--- 2/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@@ -1,32 -1,32 +1,32 @@@
  <?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";',
 -      ?string $router = 'index.php',
 -      array $cmd_args = []
 +    ?string $code = 'echo "Hello world";',
 +    ?string $router = 'index.php',
 +    array $cmd_args = []
  ) {
 -      $php_executable = getenv('TEST_PHP_EXECUTABLE');
 -      $doc_root = __DIR__;
 +    $php_executable = getenv('TEST_PHP_EXECUTABLE');
 +    $doc_root = __DIR__;
      $error = null;
  
 -      if ($code) {
 -              file_put_contents($doc_root . '/' . ($router ?: 'index.php'), '<?php ' . $code . ' ?>');
 -      }
 +    if ($code) {
 +        file_put_contents($doc_root . '/' . ($router ?: 'index.php'), '<?php ' . $code . ' ?>');
 +    }
  
 -      $cmd = [$php_executable, '-t', $doc_root, '-n', ...$cmd_args, '-S', PHP_CLI_SERVER_ADDRESS];
 -      if (!is_null($router)) {
 -              $cmd[] = $router;
 -      }
 +    $cmd = [$php_executable, '-t', $doc_root, '-n', ...$cmd_args, '-S', PHP_CLI_SERVER_ADDRESS];
 +    if (!is_null($router)) {
 +        $cmd[] = $router;
 +    }
  
 -      $descriptorspec = array(
 -              0 => STDIN,
 -              1 => STDOUT,
 -              2 => array("null"),
 -      );
 -      $handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root, null, array("suppress_errors" => true));
 +    $descriptorspec = array(
 +        0 => STDIN,
 +        1 => STDOUT,
 +        2 => array("null"),
 +    );
 +    $handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root, null, array("suppress_errors" => true));
  
      // note: here we check the process is running
      for ($i=0; $i < 120; $i++) {

diff --cc sapi/cli/tests/php_cli_server_004.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_005.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_006.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_007.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_008.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_009.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_010.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_012.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_013.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_014.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_015.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_016.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_017.phpt
Simple merge

diff --cc sapi/cli/tests/php_cli_server_020.phpt
Simple merge

diff --cc sapi/cli/tests/upload_2G.phpt
index 5012d05bc4abc0884bf986e837d7ce4fc16fb85e,6ac1bbf0aa4eedb1930cf6ba0e71a8eb0ca2f596..b9867f22d9bfe8847f47a2f60bbeda6af542b1a3
--- 1/sapi/cli/tests/upload_2G.phpt
--- 2/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@@ -44,10 -44,8 +44,8 @@@ echo "Test\n"
  include "php_cli_server.inc";
  
  php_cli_server_start("var_dump(\$_FILES);", null,
 -      ["-d", "post_max_size=3G", "-d", "upload_max_filesize=3G"]);
 +    ["-d", "post_max_size=3G", "-d", "upload_max_filesize=3G"]);
  
- list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
- $port = intval($port)?:80;
  $length = 2150000000;
  $output = "";