diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-05-04 22:39:47 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-05-04 22:39:47 +0000 |
commit | e85e30546c89e17b6fb0cf383de25b7ed7f3bf3d (patch) | |
tree | 2a1b3fd6b5c6a93bbae756e8dcea01c7c43fa198 /lib/hostares.c | |
parent | 758f6eed5169f20635c410077b840c1ffb741ddb (diff) |
Roland Blom filed bug report #1481217
(http://curl.haxx.se/bug/view.cgi?id=1481217), with follow-ups by Michele Bini
and David Byron. libcurl previously wrongly used GetLastError() on windows to
get error details after socket-related function calls, when it really should
use WSAGetLastError() instead.
When changing to this, the former function Curl_ourerrno() is now instead
called Curl_sockerrno() as it is necessary to only use it to get errno from
socket-related functions as otherwise it won't work as intended on Windows.
Diffstat (limited to 'lib/hostares.c')
-rw-r--r-- | lib/hostares.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/hostares.c b/lib/hostares.c index 6ea6e51d5..0f438477c 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2006, 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 @@ -24,7 +24,6 @@ #include "setup.h" #include <string.h> -#include <errno.h> #ifdef HAVE_MALLOC_H /* Win32 */ #include <malloc.h> @@ -208,7 +207,7 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn, break; tvp = ares_timeout(data->state.areschannel, &store, &tv); count = select(nfds, &read_fds, &write_fds, NULL, tvp); - if (count < 0 && errno != EINVAL) + if (count < 0 && Curl_sockerrno() != EINVAL) break; ares_process(data->state.areschannel, &read_fds, &write_fds); |