[GNUnet-SVN] [gnurl] 17/73: remove_handle: call multi_done() first, then clear dns cache pointer

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 1e552535e1762acd36c930299b46829e58eb1583
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Oct 7 22:00:48 2017 +0200

    remove_handle: call multi_done() first, then clear dns cache pointer
    
    Closes #1960
---
 lib/multi.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/multi.c b/lib/multi.c
index ec679ba4a..c87515969 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -711,12 +711,6 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi 
*multi,
      curl_easy_cleanup is called. */
   Curl_expire_clear(data);
 
-  if(data->dns.hostcachetype == HCACHE_MULTI) {
-    /* stop using the multi handle's DNS cache */
-    data->dns.hostcache = NULL;
-    data->dns.hostcachetype = HCACHE_NONE;
-  }
-
   if(data->easy_conn) {
 
     /* we must call multi_done() here (if we still own the connection) so that
@@ -735,6 +729,13 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi 
*multi,
       Curl_getoff_all_pipelines(data, data->easy_conn);
   }
 
+  if(data->dns.hostcachetype == HCACHE_MULTI) {
+    /* stop using the multi handle's DNS cache, *after* the possible
+       multi_done() call above */
+    data->dns.hostcache = NULL;
+    data->dns.hostcachetype = HCACHE_NONE;
+  }
+
   Curl_wildcard_dtor(&data->wildcard);
 
   /* destroy the timeout list that is held in the easy handle, do this *after*

-- 
To stop receiving notification emails like this one, please contact
address@hidden