From 2a25daa40905a1a5c8919cb332d9f997857c3659 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 20 Nov 2024 13:40:48 +0100
Subject: [PATCH 1/2] Mark tests using port 64324 as conflicting

Alternatively, we could choose another port, but that likely will
conflict with some other test in the future.  The proper solution would
be to use ephemeral ports[1], but our OpenSSL `ServerClientTestCase`
does not support this yet.

[1] <https://github.com/php/php-src/commit/6ab4e330ac032389d370a722e54ee63aafaa9728>
---
 ext/openssl/tests/san_ipv6_peer_matching.phpt | 2 ++
 ext/standard/tests/streams/bug51056.phpt      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ext/openssl/tests/san_ipv6_peer_matching.phpt b/ext/openssl/tests/san_ipv6_peer_matching.phpt
index 81966025d3969..8d7675a541f12 100644
--- a/ext/openssl/tests/san_ipv6_peer_matching.phpt
+++ b/ext/openssl/tests/san_ipv6_peer_matching.phpt
@@ -2,6 +2,8 @@
 IPv6 Peer verification matches SAN names
 --EXTENSIONS--
 openssl
+--CONFLICTS--
+port64324
 --SKIPIF--
 <?php
 if (!function_exists("proc_open")) die("skip no proc_open");
diff --git a/ext/standard/tests/streams/bug51056.phpt b/ext/standard/tests/streams/bug51056.phpt
index abb87fcb037c8..cb063c3902c1a 100644
--- a/ext/standard/tests/streams/bug51056.phpt
+++ b/ext/standard/tests/streams/bug51056.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #51056 (fread() on blocking stream will block even if data is available)
+--CONFLICTS--
+port64324
 --FILE--
 <?php
 

From 005ca7df834dcb4ea288a0c880661743e191cd3c Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 25 Nov 2024 12:34:15 +0100
Subject: [PATCH 2/2] Use another port instead of marking the tests as
 conflicting

---
 ext/openssl/tests/san_ipv6_peer_matching.phpt | 2 --
 ext/standard/tests/streams/bug51056.phpt      | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ext/openssl/tests/san_ipv6_peer_matching.phpt b/ext/openssl/tests/san_ipv6_peer_matching.phpt
index 8d7675a541f12..81966025d3969 100644
--- a/ext/openssl/tests/san_ipv6_peer_matching.phpt
+++ b/ext/openssl/tests/san_ipv6_peer_matching.phpt
@@ -2,8 +2,6 @@
 IPv6 Peer verification matches SAN names
 --EXTENSIONS--
 openssl
---CONFLICTS--
-port64324
 --SKIPIF--
 <?php
 if (!function_exists("proc_open")) die("skip no proc_open");
diff --git a/ext/standard/tests/streams/bug51056.phpt b/ext/standard/tests/streams/bug51056.phpt
index cb063c3902c1a..e011405298c24 100644
--- a/ext/standard/tests/streams/bug51056.phpt
+++ b/ext/standard/tests/streams/bug51056.phpt
@@ -1,12 +1,10 @@
 --TEST--
 Bug #51056 (fread() on blocking stream will block even if data is available)
---CONFLICTS--
-port64324
 --FILE--
 <?php
 
 $serverCode = <<<'CODE'
-$server = stream_socket_server('tcp://127.0.0.1:64324');
+$server = stream_socket_server('tcp://127.0.0.1:64327');
 phpt_notify();
 
 $conn = stream_socket_accept($server);
@@ -25,7 +23,7 @@ $clientCode = <<<'CODE'
 
 phpt_wait();
 
-$fp = fsockopen("tcp://127.0.0.1:64324");
+$fp = fsockopen("tcp://127.0.0.1:64327");
 
 while (!feof($fp)) {
     $data = fread($fp, 256);