archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use SOL_TCP instead of getprotobyname() in tests

Browse source 
This is more idiomatic anyway, and works on msan, which misses
interceptors for getprotobyname().
This commit is contained in:
Nikita Popov 2021-05-07 14:42:41 +02:00
parent 9bf1224d07
commit 0413cf3c20
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/sockets/tests/ipv4loop.phpt
View file

@ -9,7 +9,7 @@ IPv4 Loopback test
--FILE-- --FILE--
<?php <?php
/* Setup socket server */ /* Setup socket server */
$server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp')); $server = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (!$server) { if (!$server) {
die('Unable to create AF_INET socket [server]'); die('Unable to create AF_INET socket [server]');
} }
@ -25,7 +25,7 @@ IPv4 Loopback test
socket_getsockname($server, $unused, $port); socket_getsockname($server, $unused, $port);
/* Connect to it */ /* Connect to it */
$client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp')); $client = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (!$client) { if (!$client) {
die('Unable to create AF_INET socket [client]'); die('Unable to create AF_INET socket [client]');
} }

4
ext/sockets/tests/ipv6loop.phpt
View file

@ -10,7 +10,7 @@ IPv6 Loopback test
--FILE-- --FILE--
<?php <?php
/* Setup socket server */ /* Setup socket server */
$server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp')); $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
if (!$server) { if (!$server) {
die('Unable to create AF_INET6 socket [server]'); die('Unable to create AF_INET6 socket [server]');
} }
@ -29,7 +29,7 @@ IPv6 Loopback test
} }
/* Connect to it */ /* Connect to it */
$client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp')); $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
if (!$client) { if (!$client) {
die('Unable to create AF_INET6 socket [client]'); die('Unable to create AF_INET6 socket [client]');
} }

4
ext/sockets/tests/socket_getpeername_ipv4loop.phpt
View file

@ -15,7 +15,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
$localhost = '127.0.0.1'; $localhost = '127.0.0.1';
/* Setup socket server */ /* Setup socket server */
$server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp')); $server = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (!$server) { if (!$server) {
die('Unable to create AF_INET socket [server]'); die('Unable to create AF_INET socket [server]');
} }
@ -37,7 +37,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
} }
/* Connect to it */ /* Connect to it */
$client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp')); $client = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (!$client) { if (!$client) {
die('Unable to create AF_INET socket [client]'); die('Unable to create AF_INET socket [client]');
} }

4
ext/sockets/tests/socket_getpeername_ipv6loop.phpt
View file

@ -16,7 +16,7 @@ require 'ipv6_skipif.inc';
$localhost = '::1'; $localhost = '::1';
/* Setup socket server */ /* Setup socket server */
$server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp')); $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
if (!$server) { if (!$server) {
die('Unable to create AF_INET6 socket [server]'); die('Unable to create AF_INET6 socket [server]');
} }
@ -38,7 +38,7 @@ require 'ipv6_skipif.inc';
} }
/* Connect to it */ /* Connect to it */
$client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp')); $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
if (!$client) { if (!$client) {
die('Unable to create AF_INET6 socket [client]'); die('Unable to create AF_INET6 socket [client]');
} }