diff options
| -rw-r--r-- | ext/standard/tests/network/udgloop.phpt | 6 | ||||
| -rw-r--r-- | ext/standard/tests/network/udp6loop.phpt | 14 | ||||
| -rw-r--r-- | ext/standard/tests/network/unixloop.phpt | 4 | ||||
| -rwxr-xr-x | main/streams/streams.c | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt index 2642d8568d..a61d082c18 100644 --- a/ext/standard/tests/network/udgloop.phpt +++ b/ext/standard/tests/network/udgloop.phpt @@ -1,15 +1,15 @@ --TEST-- Streams Based Unix Domain Datagram Loopback test --SKIPIF-- -<?php +<?php # vim:ft=php: if (array_search("udg",stream_get_transports()) === false) - die('No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php $uniqid = uniqid(); if (file_exists("/tmp/$uniqid.sock")) - die('Temporary socket already exists.'); + die('Temporary socket /tmp/$uniqid.sock already exists.'); /* Setup socket server */ $server = stream_socket_server("udg:///tmp/$uniqid.sock", $errno, $errstr, STREAM_SERVER_BIND); diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt index fdf1b77279..5fcf7a7f46 100644 --- a/ext/standard/tests/network/udp6loop.phpt +++ b/ext/standard/tests/network/udp6loop.phpt @@ -1,10 +1,16 @@ --TEST-- Streams Based IPv6 UDP Loopback test --SKIPIF-- -<?php - /* If IPv6 is supported on the platform this will error out with code 111 - Connection refused. - If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) - Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */ +<?php # vim:ft=php: + /* If IPv6 is supported on the platform this will error out with code 111 - + * Connection refused. If IPv6 is NOT supported, $errno will be set to + * something else (indicating parse/getaddrinfo error) + * Note: Might be a good idea to export an IPv6 support indicator + * (such as AF_INET6 exported by ext/sockets), however, since we + * cannot tell for sure if IPv6 works until we probe it at run time, + * this isn't really practical. + */ + @stream_socket_client('tcp://[::1]:0', $errno); if ($errno != 111) die('skip IPv6 not supported.'); ?> diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt index 618f4866d3..abb103b0d1 100644 --- a/ext/standard/tests/network/unixloop.phpt +++ b/ext/standard/tests/network/unixloop.phpt @@ -1,9 +1,9 @@ --TEST-- Streams Based Unix Domain Loopback test --SKIPIF-- -<?php +<?php # vim:ft=php: if (array_search("unix",stream_get_transports()) === false) - die('No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php diff --git a/main/streams/streams.c b/main/streams/streams.c index c612e4ca4d..4a72d3840d 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1353,7 +1353,7 @@ int php_init_stream_wrappers(int module_number TSRMLS_DC) php_stream_xport_register("tcp", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS && php_stream_xport_register("udp", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS -#ifdef AF_UNIX +#if defined(AF_UNIX) && !(defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE)) && php_stream_xport_register("unix", php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS && |