Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'PHP-5.5'
  • Loading branch information
laruence committed Mar 5, 2013
2 parents 09e9c29 + 0827418 commit 0fbe0a1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
5 changes: 4 additions & 1 deletion ext/sockets/tests/socket_recvmsg.phpt
Expand Up @@ -5,13 +5,16 @@ recvmsg(): basic test
if (!extension_loaded('sockets')) { if (!extension_loaded('sockets')) {
die('skip sockets extension not available.'); die('skip sockets extension not available.');
} }

require 'ipv6_skipif.inc';

if (!defined('IPPROTO_IPV6')) { if (!defined('IPPROTO_IPV6')) {
die('skip IPv6 not available.'); die('skip IPv6 not available.');
} }
if (!defined('IPV6_RECVPKTINFO')) { if (!defined('IPV6_RECVPKTINFO')) {
die('skip IPV6_RECVPKTINFO not available.'); die('skip IPV6_RECVPKTINFO not available.');
} }

?>
--FILE-- --FILE--
<?php <?php
include __DIR__."/mcast_helpers.php.inc"; include __DIR__."/mcast_helpers.php.inc";
Expand Down
5 changes: 4 additions & 1 deletion ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
Expand Up @@ -4,6 +4,9 @@ sendmsg()/recvmsg(): test ability to receive multiple messages
<?php <?php
if (!extension_loaded('sockets')) if (!extension_loaded('sockets'))
die('skip sockets extension not available.'); die('skip sockets extension not available.');

require 'ipv6_skipif.inc';

if (!defined('IPPROTO_IPV6')) if (!defined('IPPROTO_IPV6'))
die('skip IPv6 not available.'); die('skip IPv6 not available.');
if (substr(PHP_OS, 0, 3) == 'WIN') if (substr(PHP_OS, 0, 3) == 'WIN')
Expand All @@ -15,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
if (!defined('IPV6_RECVPKTINFO')) { if (!defined('IPV6_RECVPKTINFO')) {
die('skip IPV6_RECVPKTINFO not available.'); die('skip IPV6_RECVPKTINFO not available.');
} }

?>
--FILE-- --FILE--
<?php <?php
include __DIR__."/mcast_helpers.php.inc"; include __DIR__."/mcast_helpers.php.inc";
Expand Down
3 changes: 3 additions & 0 deletions ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
Expand Up @@ -5,6 +5,9 @@ socket_set_option() with IPV6_PKTINFO
if (!extension_loaded('sockets')) { if (!extension_loaded('sockets')) {
die('skip sockets extension not available.'); die('skip sockets extension not available.');
} }

require 'ipv6_skipif.inc';

if (!defined('IPPROTO_IPV6')) { if (!defined('IPPROTO_IPV6')) {
die('skip IPv6 not available.'); die('skip IPv6 not available.');
} }
Expand Down

0 comments on commit 0fbe0a1

Please sign in to comment.