From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 8 Apr 2020 15:11:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0d8f012f95ba1f2d8dba238c93baf3afb73b78e;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Add php_cli_server_connect() helper
---

b0d8f012f95ba1f2d8dba238c93baf3afb73b78e
diff --cc sapi/cli/tests/bug43177.phpt
index f36019ba6b,2ab08228b9..6c734e476a
--- a/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/php_cli_server.inc
index 5767e114ca,d5f28cbb54..4cf8705a33
--- a/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/upload_2G.phpt
index 5012d05bc4,6ac1bbf0aa..b9867f22d9
--- a/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 = "";