From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 25 Feb 2019 08:24:45 +0000 (+0100)
Subject: Fix some port collisions in sockets tests
X-Git-Tag: php-7.4.0alpha1~896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c937c55d7553a7fa99877998cd6617d9e82c7dd1;p=php

Fix some port collisions in sockets tests
---

diff --git a/ext/sockets/tests/socket_export_stream-3.phpt b/ext/sockets/tests/socket_export_stream-3.phpt
index b7233dc7b9..63134cb401 100644
--- a/ext/sockets/tests/socket_export_stream-3.phpt
+++ b/ext/sockets/tests/socket_export_stream-3.phpt
@@ -6,9 +6,9 @@ if (!extension_loaded('sockets')) {
 	die('SKIP sockets extension not available.');
 }
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-$br = socket_bind($s, '0.0.0.0', 58381);
+$br = socket_bind($s, '0.0.0.0', 58393);
 if ($br === false)
-	die("SKIP IPv4/port 58381 not available");
+	die("SKIP IPv4/port 58393 not available");
 $so = socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
 	"group"	=> '224.0.0.23',
 	"interface" => "lo",
@@ -19,7 +19,7 @@ if ($so === false)
 <?php
 
 $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-socket_bind($sock, '0.0.0.0', 58381);
+socket_bind($sock, '0.0.0.0', 58393);
 $stream = socket_export_stream($sock);
 var_dump($stream);
 $so = socket_set_option($sock, IPPROTO_IP, MCAST_JOIN_GROUP, array(
@@ -31,7 +31,7 @@ var_dump($so);
 $sendsock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 var_dump($sendsock);
 $br = socket_bind($sendsock, '127.0.0.1');
-$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58381);
+$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58393);
 var_dump($so);
 
 stream_set_blocking($stream, 0);
diff --git a/ext/sockets/tests/socket_export_stream-5.phpt b/ext/sockets/tests/socket_export_stream-5.phpt
index db2d018d47..413ce24f3e 100644
--- a/ext/sockets/tests/socket_export_stream-5.phpt
+++ b/ext/sockets/tests/socket_export_stream-5.phpt
@@ -11,12 +11,12 @@ if (!function_exists('zend_leak_variable'))
 <?php
 
 $sock0 = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-socket_bind($sock0, '0.0.0.0', 58380);
+socket_bind($sock0, '0.0.0.0', 58385);
 $stream0 = socket_export_stream($sock0);
 zend_leak_variable($stream0);
 
 $sock1 = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-socket_bind($sock1, '0.0.0.0', 58381);
+socket_bind($sock1, '0.0.0.0', 58386);
 $stream1 = socket_export_stream($sock1);
 zend_leak_variable($sock1);
 
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index 6c62a89fff..a281cbcbce 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -29,30 +29,30 @@ function test($stream, $sock) {
 }
 
 echo "normal\n";
-$stream0 = stream_socket_server("udp://0.0.0.0:58380", $errno, $errstr, STREAM_SERVER_BIND);
+$stream0 = stream_socket_server("udp://0.0.0.0:58387", $errno, $errstr, STREAM_SERVER_BIND);
 $sock0 = socket_import_stream($stream0);
 test($stream0, $sock0);
 
 echo "\nunset stream\n";
-$stream1 = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
+$stream1 = stream_socket_server("udp://0.0.0.0:58388", $errno, $errstr, STREAM_SERVER_BIND);
 $sock1 = socket_import_stream($stream1);
 unset($stream1);
 test(null, $sock1);
 
 echo "\nunset socket\n";
-$stream2 = stream_socket_server("udp://0.0.0.0:58382", $errno, $errstr, STREAM_SERVER_BIND);
+$stream2 = stream_socket_server("udp://0.0.0.0:58389", $errno, $errstr, STREAM_SERVER_BIND);
 $sock2 = socket_import_stream($stream2);
 unset($sock2);
 test($stream2, null);
 
 echo "\nclose stream\n";
-$stream3 = stream_socket_server("udp://0.0.0.0:58383", $errno, $errstr, STREAM_SERVER_BIND);
+$stream3 = stream_socket_server("udp://0.0.0.0:58390", $errno, $errstr, STREAM_SERVER_BIND);
 $sock3 = socket_import_stream($stream3);
 fclose($stream3);
 test($stream3, $sock3);
 
 echo "\nclose socket\n";
-$stream4 = stream_socket_server("udp://0.0.0.0:58384", $errno, $errstr, STREAM_SERVER_BIND);
+$stream4 = stream_socket_server("udp://0.0.0.0:58391", $errno, $errstr, STREAM_SERVER_BIND);
 $sock4 = socket_import_stream($stream4);
 socket_close($sock4);
 test($stream4, $sock4);
diff --git a/ext/sockets/tests/socket_import_stream-4.phpt b/ext/sockets/tests/socket_import_stream-4.phpt
index 4b645014d7..f124161e10 100644
--- a/ext/sockets/tests/socket_import_stream-4.phpt
+++ b/ext/sockets/tests/socket_import_stream-4.phpt
@@ -29,30 +29,30 @@ function test($stream, $sock) {
 }
 
 echo "normal\n";
-$stream0 = stream_socket_server("udp://0.0.0.0:58380", $errno, $errstr, STREAM_SERVER_BIND);
+$stream0 = stream_socket_server("udp://0.0.0.0:58387", $errno, $errstr, STREAM_SERVER_BIND);
 $sock0 = socket_import_stream($stream0);
 test($stream0, $sock0);
 
 echo "\nunset stream\n";
-$stream1 = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
+$stream1 = stream_socket_server("udp://0.0.0.0:58388", $errno, $errstr, STREAM_SERVER_BIND);
 $sock1 = socket_import_stream($stream1);
 unset($stream1);
 test(null, $sock1);
 
 echo "\nunset socket\n";
-$stream2 = stream_socket_server("udp://0.0.0.0:58382", $errno, $errstr, STREAM_SERVER_BIND);
+$stream2 = stream_socket_server("udp://0.0.0.0:58389", $errno, $errstr, STREAM_SERVER_BIND);
 $sock2 = socket_import_stream($stream2);
 unset($sock2);
 test($stream2, null);
 
 echo "\nclose stream\n";
-$stream3 = stream_socket_server("udp://0.0.0.0:58383", $errno, $errstr, STREAM_SERVER_BIND);
+$stream3 = stream_socket_server("udp://0.0.0.0:58390", $errno, $errstr, STREAM_SERVER_BIND);
 $sock3 = socket_import_stream($stream3);
 fclose($stream3);
 test($stream3, $sock3);
 
 echo "\nclose socket\n";
-$stream4 = stream_socket_server("udp://0.0.0.0:58384", $errno, $errstr, STREAM_SERVER_BIND);
+$stream4 = stream_socket_server("udp://0.0.0.0:58391", $errno, $errstr, STREAM_SERVER_BIND);
 $sock4 = socket_import_stream($stream4);
 socket_close($sock4);
 test($stream4, $sock4);