diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hostip.h | 3 | ||||
| -rw-r--r-- | lib/multi.c | 6 | ||||
| -rw-r--r-- | lib/url.c | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lib/hostip.h b/lib/hostip.h index 3baf8284b..62c6721e1 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -7,7 +7,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 @@ -82,6 +82,7 @@ #define CURL_ASYNC_SUCCESS ARES_SUCCESS #else #define CURL_ASYNC_SUCCESS CURLE_OK +#define ares_cancel(x) #endif /* diff --git a/lib/multi.c b/lib/multi.c index a7d1988d6..6213fede4 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -92,10 +92,10 @@ struct Curl_one_easy { int msg_num; /* number of messages left in 'msg' to return */ }; - #define CURL_MULTI_HANDLE 0x000bab1e -#define GOOD_MULTI_HANDLE(x) ((x)&&(((struct Curl_multi *)x)->type == CURL_MULTI_HANDLE)) +#define GOOD_MULTI_HANDLE(x) \ + ((x)&&(((struct Curl_multi *)x)->type == CURL_MULTI_HANDLE)) #define GOOD_EASY_HANDLE(x) (x) /* This is the struct known as CURLM on the outside */ @@ -245,6 +245,8 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle, Curl_easy_addmulti(easy->easy_handle, NULL); /* clear the association to this multi handle */ + Curl_done(&easy->easy_conn, easy->result); + /* make the previous node point to our next */ if(easy->prev) easy->prev->next = easy->next; @@ -3654,7 +3654,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, /* Continue connectdata initialization here. * * Inherit the proper values from the urldata struct AFTER we have arranged - * the persistent conncetion stuff */ + * the persistent connection stuff */ conn->fread = data->set.fread; conn->fread_in = data->set.in; @@ -3999,6 +3999,10 @@ CURLcode Curl_done(struct connectdata **connp, Curl_pgrsDone(conn); /* done with the operation */ + /* for ares-using, make sure all possible outstanding requests are properly + cancelled before we proceed */ + ares_cancel(data->state.areschannel); + /* if data->set.reuse_forbid is TRUE, it means the libcurl client has forced us to close this no matter what we think. |