On Fri, 3 Aug 2012, Jan Koen Annot wrote:
2.1 Remove the usage of WSAPoll (see file select.h of the curl library
source code; I am using curl-7.26.0)
Thanks for your report and work on this.
I thus suggest a patch as attached. Any objections from anyone?
--
/ daniel.haxx.se
From 1206efb718df70fa6bb33a29402b3dd89f1546a7 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <[email protected]>
Date: Tue, 7 Aug 2012 15:01:54 +0200
Subject: [PATCH] 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
---
lib/select.h | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/lib/select.h b/lib/select.h
index b50604b..c1769e9 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, 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.
*/
--
1.7.10.4
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
