Port OpenSSL gh10495, gh13860 and gh9310 test to use ephemeral ports

Author: bukka

ext/openssl/tests/gh10495.phpt

@@ -15,11 +15,7 @@ $peerName = 'gh10495';
 $clientCode = <<<'CODE'
     $context = stream_context_create(['ssl' => ['verify_peer' => false, 'peer_name' => '%s']]);
 
-    phpt_wait('server');
-    phpt_notify('proxy');
-
-    phpt_wait('proxy');
-    $fp = stream_socket_client("tlsv1.2://127.0.0.1:10012", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
+    $fp = stream_socket_client("tlsv1.2://{{ ADDR }}", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
 
     phpt_wait('proxy');
 
@@ -38,8 +34,8 @@ $serverCode = <<<'CODE'
     $context = stream_context_create(['ssl' => ['local_cert' => '%s']]);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $fp = stream_socket_server("tlsv1.2://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
-    phpt_notify();
+    $fp = stream_socket_server("tlsv1.2://127.0.0.1:0", $errornum, $errorstr, $flags, $context);
+    phpt_notify_server_start($fp);
 
     $conn = stream_socket_accept($fp);
     fwrite($conn, 'warmup');
@@ -50,14 +46,12 @@ CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $proxyCode = <<<'CODE'
-    phpt_wait();
-
-    $upstream = stream_socket_client("tcp://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
+    $upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
     stream_set_blocking($upstream, false);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $server = stream_socket_server("tcp://127.0.0.1:10012", $errornum, $errorstr, $flags);
-    phpt_notify();
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
+    phpt_notify_server_start($server);
     $conn = stream_socket_accept($server);
     stream_set_blocking($conn, false);
 

ext/openssl/tests/gh13860.phpt

@@ -9,12 +9,12 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 --FILE--
 <?php
 $serverCode = <<<'CODE'
-    $serverUri = "tcp://127.0.0.1:64326";
+    $serverUri = "tcp://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create();
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = @stream_socket_accept($server);
     if ($client) {
@@ -26,10 +26,9 @@ $serverCode = <<<'CODE'
 CODE;
 
 $clientCode = <<<'CODE'
-    $serverUri = "tcp://127.0.0.1:64326";
+    $serverUri = "tcp://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
-    phpt_wait();
     $fp = stream_socket_client($serverUri);
     stream_set_blocking($fp, false);
 

ext/openssl/tests/gh9310.phpt

@@ -29,29 +29,28 @@ copy(__DIR__ . '/sni_server_uk_cert.pem', $baseDir . '/sni_server_uk_cert.pem');
 $serverCodeTemplate = <<<'CODE'
     ini_set('log_errors', 'On');
     ini_set('open_basedir',  __DIR__ . '/gh9310');
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create(['ssl' => [
         'local_cert' => '%s',
         'local_pk' => '%s',
     ]]);
 
     $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($sock);
 
     $link = stream_socket_accept($sock);
 CODE;
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
     $clientCtx = stream_context_create(['ssl' => [
         'verify_peer' => false,
         'verify_peer_name' => false
     ]]);
 
-    phpt_wait();
     @stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 CODE;
 
@@ -65,8 +64,8 @@ $sniServerCodeV1 = <<<'CODE'
         ]
     ]]);
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -84,8 +83,8 @@ $sniServerCodeV2 = <<<'CODE'
         ]
     ]]);
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -103,8 +102,8 @@ $sniServerCodeV3 = <<<'CODE'
         ]
     ]]);
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -115,11 +114,9 @@ $sniClientCodeTemplate = <<<'CODE'
         'cafile' => __DIR__ . '/sni_server_ca.pem',
     ];
 
-    phpt_wait();
-
     $ctxArr['peer_name'] = '%s';
     $ctx = stream_context_create(['ssl' => $ctxArr]);
-    @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
 CODE;
 
 $serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile);