aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2012-08-07 15:01:54 +0200
committerDaniel Stenberg <daniel@haxx.se>2012-08-07 20:47:31 +0200
commit8bad5f2a6169e2e816aed7a5147becba489d59e1 (patch)
tree2c1ca47e483f0e75347d9ec82073da280cfe8db5
parentf0d611df9e5f606cd402a2de84f1cdd69ebc5864 (diff)
WSAPoll: disabled on all windows builds
Due to WSAPoll bugs, libcurl does not work as intended. When the cURL library is used to setup a connection to an incorrect port, normally the result is CURLE_COULDNT_CONNECT, /* 7 */, but due to the bug in WSAPoll, the result now is CURLE_OPERATION_TIMEDOUT, /* 28 - the timeout time was reached */. On August 1, Jan Koen Annot opened a case for this to Microsoft Premier Online (https://premier.microsoft.com/). The support engineer handling the case wrote that the case description is quite clear. He will try to reproduce the issue and then proceed with troubleshooting it. Reported by: Jan Koen Annot Bug: http://curl.haxx.se/mail/lib-2012-07/0310.html
-rw-r--r--lib/select.h20
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/select.h b/lib/select.h
index b50604b0a..c1769e9a8 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -31,24 +31,6 @@
#endif
/*
- * poll() function on Windows Vista and later is called WSAPoll()
- */
-
-#if defined(USE_WINSOCK) && (USE_WINSOCK > 1) && \
- defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
-# undef HAVE_POLL
-# define HAVE_POLL 1
-# undef HAVE_POLL_FINE
-# define HAVE_POLL_FINE 1
-# define poll(x,y,z) WSAPoll((x),(y),(z))
-# if defined(_MSC_VER) && defined(POLLRDNORM)
-# undef POLLPRI
-# define POLLPRI POLLRDBAND
-# define HAVE_STRUCT_POLLFD 1
-# endif
-#endif
-
-/*
* Definition of pollfd struct and constants for platforms lacking them.
*/