1 files changed, 6 insertions, 0 deletions
diff --git a/lib/multi.c b/lib/multi.c
index faf42f1fa..ec679ba4a 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -537,6 +537,12 @@ static CURLcode multi_done(struct connectdata **connp,
     /* Stop if multi_done() has already been called */
     return CURLE_OK;
 
+  if(data->mstate == CURLM_STATE_WAITRESOLVE) {
+    /* done while still waiting for the resolve to complete */
+    struct Curl_dns_entry *throw_away;
+    (void)Curl_resolver_wait_resolv(conn, &throw_away);
+  }
+
   Curl_getoff_all_pipelines(data, conn);
 
   /* Cleanup possible redirect junk */