wez Fri Dec 5 08:41:03 2003 EDT
Modified files:
/php-src/ext/standard/tests/network udgloop.phpt udp6loop.phpt
unixloop.phpt
/php-src/main/streams streams.c
Log:
Be smarter about which systems should register unix transports.
Fix skip conditions in these network tests
Index: php-src/ext/standard/tests/network/udgloop.phpt
diff -u php-src/ext/standard/tests/network/udgloop.phpt:1.1
php-src/ext/standard/tests/network/udgloop.phpt:1.2
--- php-src/ext/standard/tests/network/udgloop.phpt:1.1 Sun Aug 10 21:30:55 2003
+++ php-src/ext/standard/tests/network/udgloop.phpt Fri Dec 5 08:41:01 2003
@@ -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);
Index: php-src/ext/standard/tests/network/udp6loop.phpt
diff -u php-src/ext/standard/tests/network/udp6loop.phpt:1.2
php-src/ext/standard/tests/network/udp6loop.phpt:1.3
--- php-src/ext/standard/tests/network/udp6loop.phpt:1.2 Mon Aug 11 20:44:05
2003
+++ php-src/ext/standard/tests/network/udp6loop.phpt Fri Dec 5 08:41:01 2003
@@ -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.');
?>
Index: php-src/ext/standard/tests/network/unixloop.phpt
diff -u php-src/ext/standard/tests/network/unixloop.phpt:1.1
php-src/ext/standard/tests/network/unixloop.phpt:1.2
--- php-src/ext/standard/tests/network/unixloop.phpt:1.1 Sun Aug 10 21:30:55
2003
+++ php-src/ext/standard/tests/network/unixloop.phpt Fri Dec 5 08:41:01 2003
@@ -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
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.43 php-src/main/streams/streams.c:1.44
--- php-src/main/streams/streams.c:1.43 Fri Nov 28 18:25:27 2003
+++ php-src/main/streams/streams.c Fri Dec 5 08:41:02 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.43 2003/11/28 23:25:27 pollita Exp $ */
+/* $Id: streams.c,v 1.44 2003/12/05 13:41:02 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1353,7 +1353,7 @@
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
&&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
