Merge branch 'PHP-5.5'

laruence · laruence · commit 0fbe0a149505 · 2013-03-05T17:18:41.000+08:00
diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt
@@ -5,13 +5,16 @@ recvmsg(): basic test
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6')) {
     die('skip IPv6 not available.');
 }
 if (!defined('IPV6_RECVPKTINFO')) {
     die('skip IPV6_RECVPKTINFO not available.');
 }
-
+?>
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -4,6 +4,9 @@ sendmsg()/recvmsg(): test ability to receive multiple messages
 <?php
 if (!extension_loaded('sockets'))
 	die('skip sockets extension not available.');
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6'))
 	die('skip IPv6 not available.');
 if (substr(PHP_OS, 0, 3) == 'WIN') 
@@ -15,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN')
 if (!defined('IPV6_RECVPKTINFO')) {
     die('skip IPV6_RECVPKTINFO not available.');
 }
-
+?>
 --FILE--
 <?php
 include __DIR__."/mcast_helpers.php.inc";
diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
@@ -5,6 +5,9 @@ socket_set_option() with IPV6_PKTINFO
 if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
+
+require 'ipv6_skipif.inc';
+
 if (!defined('IPPROTO_IPV6')) {
     die('skip IPv6 not available.');
 }

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,16 @@ recvmsg(): basic test`
`5`	`5`	`if (!extension_loaded('sockets')) {`
`6`	`6`	`die('skip sockets extension not available.');`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+require 'ipv6_skipif.inc';`
	`10`	`+`
`8`	`11`	`if (!defined('IPPROTO_IPV6')) {`
`9`	`12`	`die('skip IPv6 not available.');`
`10`	`13`	`}`
`11`	`14`	`if (!defined('IPV6_RECVPKTINFO')) {`
`12`	`15`	`die('skip IPV6_RECVPKTINFO not available.');`
`13`	`16`	`}`
`14`		`-`
	`17`	`+?>`
`15`	`18`	`--FILE--`
`16`	`19`	`<?php`
`17`	`20`	`include __DIR__."/mcast_helpers.php.inc";`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ socket_set_option() with IPV6_PKTINFO`
`5`	`5`	`if (!extension_loaded('sockets')) {`
`6`	`6`	`die('skip sockets extension not available.');`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+require 'ipv6_skipif.inc';`
	`10`	`+`
`8`	`11`	`if (!defined('IPPROTO_IPV6')) {`
`9`	`12`	`die('skip IPv6 not available.');`
`10`	`13`	`}`