summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/standard/file.c11
2 files changed, 10 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e53b853c6f..982f6f1627 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP 4.0 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ?? ????, Version 4.0 Beta 4
+- Removed select(), fd_set() and fd_isset() - will be reimplemented soon! (Thies)
- Improved Win32 performance significantly by using different mutexes (Zeev,
TSRM library)
- Made quotemeta() and preg_quote() binary-safe. (Andrei)
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 63a3ea4f77..42ae02e775 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -111,8 +111,6 @@ static void _file_upload_dtor(char *file);
/* sharing globals is *evil* */
static int le_fopen,le_popen, le_socket, le_uploads;
-static fd_set readfd;
-static int max_fd;
/* }}} */
/* {{{ tempnam */
@@ -244,9 +242,11 @@ function_entry file_functions[] = {
#if (0 && defined(HAVE_SYS_TIME_H) && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO))
PHP_FE(set_socket_timeout, NULL)
#endif
+#if 0 /* needs to be rethought 991221 thies@digicol.de */
PHP_FE(fd_set, NULL)
PHP_FE(fd_isset, NULL)
PHP_FE(select, NULL)
+#endif
{NULL, NULL, NULL}
};
@@ -1674,6 +1674,11 @@ PHP_FUNCTION(fgetcsv) {
/* }}} */
+#if 0
+
+static fd_set readfd;
+static int max_fd;
+
PHP_FUNCTION(fd_set)
{
pval **arg;
@@ -1765,3 +1770,5 @@ PHP_FUNCTION(fd_isset)
}
RETURN_FALSE;
}
+
+#endif