diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-03 10:51:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-03 10:51:04 +0800 |
| commit | f2246f352fc01295c370728d68a9bcd2bb546652 (patch) | |
| tree | 172b9a7346465906eb14a350b9ab0e003c09df23 | |
| parent | 99b373da25d88f3fc1fed070d55949c59508fd08 (diff) | |
| download | php-git-f2246f352fc01295c370728d68a9bcd2bb546652.tar.gz | |
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.
| -rw-r--r-- | ext/sockets/php_sockets.h | 4 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_option_error_socket_option.phpt | 5 |
2 files changed, 9 insertions, 0 deletions
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); |