Commit: f2246f352fc01295c370728d68a9bcd2bb546652 Author: Xinchen Hui <larue...@php.net> Sun, 3 Mar 2013 10:51:04 +0800 Parents: 99b373da25d88f3fc1fed070d55949c59508fd08 Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2246f352fc01295c370728d68a9bcd2bb546652 Log: 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. Bugs: https://bugs.php.net/64340 Changed paths: M ext/sockets/php_sockets.h M ext/sockets/tests/socket_set_option_error_socket_option.phpt Diff: diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 17abf95..4486783 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 eaa0e64..471d6bf 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); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
