the missing part of Gisle Vanem's connect-timeout fix for win32

diff --git a/lib/url.c b/lib/url.c
index f9181fe60fcfd3d60bde6be15b4e673b44690204..78c25aebc7c782bf71b5807f3a29cb9d9a47ca9e 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -1360,9 +1360,10 @@ CURLcode Curl_disconnect(struct connectdata *conn)
   Curl_safefree(conn->allocptr.host);
   Curl_safefree(conn->allocptr.cookiehost);
   Curl_safefree(conn->proxyhost);
-#ifdef USE_ARES
+#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME)
   /* possible left-overs from the async name resolve */
   Curl_safefree(conn->async.hostname);
+  Curl_safefree(conn->async.os_specific);
 #endif
   
   Curl_free_ssl_config(&conn->ssl_config);
@@ -3238,7 +3239,7 @@ CURLcode Curl_connect(struct SessionHandle *data,
    then a successful name resolve has been received */
 CURLcode Curl_async_resolved(struct connectdata *conn)
 {
-#ifdef USE_ARES
+#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME)
   CURLcode code = SetupConnection(conn, conn->async.dns);
 
   if(code)

diff --git a/lib/urldata.h b/lib/urldata.h
index 899e154f639e92e69936be26598a00f2d925fb0d..4011368747ae9066f6862f7d0e0cd40d5fe66e91 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -376,13 +376,14 @@ struct Curl_transfer_keeper {
   bool ignorebody;  /* we read a response-body but we ignore it! */
 };
 
-#ifdef USE_ARES
+#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME)
 struct Curl_async {
   char *hostname;
   int port;
   struct Curl_dns_entry *dns;
   bool done;  /* set TRUE when the lookup is complete */
   int status; /* if done is TRUE, this is the status from the callback */
+  void *os_specific;  /* 'struct thread_data' for Windows */
 };
 #endif
 
@@ -566,7 +567,7 @@ struct connectdata {
 
   int sockerror; /* errno stored by Curl_read() if the underlying layer returns
                     error */
-#ifdef USE_ARES
+#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME)
   /* data used for the asynch name resolve callback */
   struct Curl_async async;
 #endif