Fixed Bug #64340 (sockets tests failed) Patch by Reeze

Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 17abf95a19c8cb3b47e60d88b42577f8d2ae63c2..448678366a237a6f805dc1315685e5374132af5c 100644 (file)
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -28,6 +28,10 @@
 # include "config.h"
 #endif
 
+#ifdef __APPLE__
+#define __APPLE_USE_RFC_3542
+#endif
+
 #if HAVE_SOCKETS
 
 #include <php.h>

diff --git a/ext/sockets/tests/socket_set_option_error_socket_option.phpt b/ext/sockets/tests/socket_set_option_error_socket_option.phpt
index eaa0e64faf0fd438ce3b050aa0f0aa6f489b0717..471d6bf8ca6d1350db3e39def7f4ee4fe092b373 100644 (file)
--- a/ext/sockets/tests/socket_set_option_error_socket_option.phpt
+++ b/ext/sockets/tests/socket_set_option_error_socket_option.phpt
@@ -5,6 +5,11 @@ Test if socket_set_option() returns 'unable to set socket option' failure for in
 if (!extension_loaded('sockets')) {
         die('SKIP sockets extension not available.');
 }
+
+if (PHP_OS == 'Darwin') {
+   die('skip Not for OSX');
+}
+
 $filename = dirname(__FILE__) . '/006_root_check.tmp';
 $fp = fopen($filename, 'w');
 fclose($fp);