com php-src: Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze": ext/sockets/php_sockets.h ext/sockets/tests/socke
t_set_option_error_socket_option.phpt
| From: | Xinchen Hui | Date: | Tue, 05 Mar 2013 05:58:20 +0000 |
| Subject: | com php-src: Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze": ext/sockets/php_sockets.h ext/sockets/tests/socke t_set_option_error_socket_option.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71399@lists.php.net to get a copy of this message | ||
Commit: 3f67d5ae434236be1db2ee54baf85725ac7b6a56
Author: Xinchen Hui <laruence@php.net> Tue, 5 Mar 2013 13:58:20 +0800
Parents: 0404c38615b54f6ea58ebd16f104da03f1202324
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f67d5ae434236be1db2ee54baf85725ac7b6a56
Log:
Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze"
build break, will only leave the test script fix first
This reverts commit f2246f352fc01295c370728d68a9bcd2bb546652..
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 4486783..17abf95 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -28,10 +28,6 @@
# 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 471d6bf..eaa0e64 100644
--- a/ext/sockets/tests/socket_set_option_error_socket_option.phpt
+++ b/ext/sockets/tests/socket_set_option_error_socket_option.phpt
@@ -5,11 +5,6 @@ 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);