lbarnaud Wed May 20 09:13:29 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sockets/tests ipv6_skipif.inc
Modified files:
/php-src/ext/sockets/tests ipv6loop.phpt
socket_sentto_recvfrom_ipv6_udp.phpt
Log:
MFH: Fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1.2.1&r2=1.2.6.1.2.2&diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1
php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.2
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1 Wed Jul 16 14:08:38 2008
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed May 20 09:13:29 2009
@@ -5,9 +5,7 @@
if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
- if (!defined("AF_INET6")) {
- die('skip no IPv6 support');
- }
+ require 'ipv6_skipif.inc';
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
diff -u php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.2
php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.3
--- php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt:1.1.2.2
Sun May 17 18:08:09 2009
+++ php-src/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt Wed May
20 09:13:29 2009
@@ -5,6 +5,7 @@
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
+require 'ipv6_skipif.inc';
--FILE--
<?php
$socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6_skipif.inc?view=markup&rev=1.1
Index: php-src/ext/sockets/tests/ipv6_skipif.inc
+++ php-src/ext/sockets/tests/ipv6_skipif.inc
<?php
if (!defined("AF_INET6")) {
die('skip no IPv6 support');
}
/* 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) */
@stream_socket_client('tcp://[::1]:0', $errno);
if ($errno != 111) die('skip no IPv6 support');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
