Skip to content

Commit 005ca7d

Browse files
committed
Use another port instead of marking the tests as conflicting
1 parent 2a25daa commit 005ca7d

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ext/openssl/tests/san_ipv6_peer_matching.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
IPv6 Peer verification matches SAN names
33
--EXTENSIONS--
44
openssl
5-
--CONFLICTS--
6-
port64324
75
--SKIPIF--
86
<?php
97
if (!function_exists("proc_open")) die("skip no proc_open");

ext/standard/tests/streams/bug51056.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
--TEST--
22
Bug #51056 (fread() on blocking stream will block even if data is available)
3-
--CONFLICTS--
4-
port64324
53
--FILE--
64
<?php
75

86
$serverCode = <<<'CODE'
9-
$server = stream_socket_server('tcp://127.0.0.1:64324');
7+
$server = stream_socket_server('tcp://127.0.0.1:64327');
108
phpt_notify();
119
1210
$conn = stream_socket_accept($server);
@@ -25,7 +23,7 @@ $clientCode = <<<'CODE'
2523
2624
phpt_wait();
2725
28-
$fp = fsockopen("tcp://127.0.0.1:64324");
26+
$fp = fsockopen("tcp://127.0.0.1:64327");
2927
3028
while (!feof($fp)) {
3129
$data = fread($fp, 256);

0 commit comments

Comments
 (0)