Merge branch 'PHP-5.5'

laruence · laruence · commit 09e9c294b8b4 · 2013-03-05T16:57:37.000+08:00
diff --git a/ext/sockets/tests/socket_recvmsg.phpt b/ext/sockets/tests/socket_recvmsg.phpt
@@ -3,10 +3,13 @@ recvmsg(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 }
 if (!defined('IPPROTO_IPV6')) {
-die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
+}
+if (!defined('IPV6_RECVPKTINFO')) {
+    die('skip IPV6_RECVPKTINFO not available.');
 }
 
 --FILE--
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -6,12 +6,16 @@ if (!extension_loaded('sockets'))
 	die('skip sockets extension not available.');
 if (!defined('IPPROTO_IPV6'))
 	die('skip IPv6 not available.');
-if (substr(PHP_OS, 0, 3) == 'WIN')
+if (substr(PHP_OS, 0, 3) == 'WIN') 
 	die('skip Not for the Windows!');
 /* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
  * WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
  * does not accept IPV6_TCLASS messages */
 
+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
@@ -3,13 +3,17 @@ socket_set_option() with IPV6_PKTINFO
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 }
 if (!defined('IPPROTO_IPV6')) {
-die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 }
-if (substr(PHP_OS, 0, 3) == 'WIN')
-	die('skip Not for Windows!');
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip Not for Windows!');
+}
+if (!defined('IPV6_PKTINFO')) {
+    die('skip IPV6_PKTINFO not available.');
+} 
 --FILE--
 <?php
 
@@ -29,4 +33,3 @@ var_dump(socket_set_option($s, IPPROTO_IPV6, IPV6_PKTINFO, [
 Warning: socket_set_option(): error converting user data (path: in6_pktinfo): The key 'addr' is required in %s on line %d
 bool(false)
 bool(true)
-
