From: Xinchen Hui <laruence@php.net>
Date: Sun, 3 Mar 2013 02:51:04 +0000 (+0800)
Subject: Fixed Bug #64340  (sockets tests failed) Patch by Reeze
X-Git-Tag: php-5.5.0alpha6~12^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2246f352fc01295c370728d68a9bcd2bb546652;p=php

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 17abf95a19..448678366a 100644
--- 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 eaa0e64faf..471d6bf8ca 100644
--- 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);