generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Stenberg 2004-02-22 22:31:24 +00:00
parent ea4cd4d8aa
commit 0ffec4272a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/url.c
View File

@ -1360,9 +1360,10 @@ CURLcode Curl_disconnect(struct connectdata *conn)
Curl_safefree(conn->allocptr.host); Curl_safefree(conn->allocptr.host);
Curl_safefree(conn->allocptr.cookiehost); Curl_safefree(conn->allocptr.cookiehost);
Curl_safefree(conn->proxyhost); Curl_safefree(conn->proxyhost);
#ifdef USE_ARES #if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME)
/* possible left-overs from the async name resolve */ /* possible left-overs from the async name resolve */
Curl_safefree(conn->async.hostname); Curl_safefree(conn->async.hostname);
Curl_safefree(conn->async.os_specific);
#endif #endif
Curl_free_ssl_config(&conn->ssl_config); 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 */ then a successful name resolve has been received */
CURLcode Curl_async_resolved(struct connectdata *conn) 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); CURLcode code = SetupConnection(conn, conn->async.dns);
if(code) if(code)

5
lib/urldata.h
View File

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