Use SOL_TCP instead of getprotobyname() in tests

nikic · nikic · commit 0413cf3c203a · 2021-05-07T14:55:18.000+02:00
This is more idiomatic anyway, and works on msan, which misses
interceptors for getprotobyname().
diff --git a/ext/sockets/tests/ipv4loop.phpt b/ext/sockets/tests/ipv4loop.phpt
@@ -9,7 +9,7 @@ IPv4 Loopback test
 --FILE--
 <?php
     /* Setup socket server */
-    $server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
+    $server = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     if (!$server) {
         die('Unable to create AF_INET socket [server]');
     }
@@ -25,7 +25,7 @@ IPv4 Loopback test
     socket_getsockname($server, $unused, $port);
 
     /* Connect to it */
-    $client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
+    $client = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     if (!$client) {
         die('Unable to create AF_INET socket [client]');
     }
diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt
@@ -10,7 +10,7 @@ IPv6 Loopback test
 --FILE--
 <?php
     /* Setup socket server */
-    $server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
+    $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
     if (!$server) {
         die('Unable to create AF_INET6 socket [server]');
     }
@@ -29,7 +29,7 @@ IPv6 Loopback test
     }
 
     /* Connect to it */
-    $client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
+    $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
     if (!$client) {
         die('Unable to create AF_INET6 socket [client]');
     }
diff --git a/ext/sockets/tests/socket_getpeername_ipv4loop.phpt b/ext/sockets/tests/socket_getpeername_ipv4loop.phpt
@@ -15,7 +15,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
     $localhost = '127.0.0.1';
 
         /* Setup socket server */
-        $server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
+        $server = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
         if (!$server) {
                 die('Unable to create AF_INET socket [server]');
         }
@@ -37,7 +37,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
         }
 
         /* Connect to it */
-        $client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
+        $client = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
         if (!$client) {
                 die('Unable to create AF_INET socket [client]');
         }
diff --git a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
@@ -16,7 +16,7 @@ require 'ipv6_skipif.inc';
     $localhost = '::1';
 
         /* Setup socket server */
-        $server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
+        $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
         if (!$server) {
                 die('Unable to create AF_INET6 socket [server]');
         }
@@ -38,7 +38,7 @@ require 'ipv6_skipif.inc';
         }
 
         /* Connect to it */
-        $client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
+        $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
         if (!$client) {
                 die('Unable to create AF_INET6 socket [client]');
         }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ IPv6 Loopback test`
`10`	`10`	`--FILE--`
`11`	`11`	`<?php`
`12`	`12`	`/* Setup socket server */`
`13`		`- $server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));`
	`13`	`+ $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);`
`14`	`14`	`if (!$server) {`
`15`	`15`	`die('Unable to create AF_INET6 socket [server]');`
`16`	`16`	`}`
`@@ -29,7 +29,7 @@ IPv6 Loopback test`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/* Connect to it */`
`32`		`- $client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));`
	`32`	`+ $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);`
`33`	`33`	`if (!$client) {`
`34`	`34`	`die('Unable to create AF_INET6 socket [client]');`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com`
`15`	`15`	`$localhost = '127.0.0.1';`
`16`	`16`
`17`	`17`	`/* Setup socket server */`
`18`		`- $server = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));`
	`18`	`+ $server = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);`
`19`	`19`	`if (!$server) {`
`20`	`20`	`die('Unable to create AF_INET socket [server]');`
`21`	`21`	`}`
`@@ -37,7 +37,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/* Connect to it */`
`40`		`- $client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));`
	`40`	`+ $client = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);`
`41`	`41`	`if (!$client) {`
`42`	`42`	`die('Unable to create AF_INET socket [client]');`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ require 'ipv6_skipif.inc';`
`16`	`16`	`$localhost = '::1';`
`17`	`17`
`18`	`18`	`/* Setup socket server */`
`19`		`- $server = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));`
	`19`	`+ $server = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);`
`20`	`20`	`if (!$server) {`
`21`	`21`	`die('Unable to create AF_INET6 socket [server]');`
`22`	`22`	`}`
`@@ -38,7 +38,7 @@ require 'ipv6_skipif.inc';`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/* Connect to it */`
`41`		`- $client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));`
	`41`	`+ $client = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);`
`42`	`42`	`if (!$client) {`
`43`	`43`	`die('Unable to create AF_INET6 socket [client]');`
`44`	`44`	`}`