Use Curl_easy_addmulti() to clear associations from easy handles to multi

handles. Include multi.h to get proto.

diff --git a/lib/multi.c b/lib/multi.c
index 63eb505f561a137a4ab4654e53d5e0e4e169d0a9..2822b16a47960fab058ec3933eb74a98270f999b 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -44,6 +44,7 @@
 #include "progress.h"
 #include "memory.h"
 #include "easy.h"
+#include "multi.h"
 
 /* The last #include file should be: */
 #include "memdebug.h"
@@ -210,6 +211,8 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
 
     /* clear out the usage of the shared DNS cache */
     easy->easy_handle->hostcache = NULL;
+    Curl_easy_addmulti(easy->easy_handle, NULL); /* clear the association
+                                                    to this multi handle */
 
     /* make the previous node point to our next */
     if(easy->prev)
@@ -610,7 +613,7 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
       nexteasy=easy->next;
       /* clear out the usage of the shared DNS cache */
       easy->easy_handle->hostcache = NULL;
-      easy->easy_handle->multi = NULL;
+      Curl_easy_addmulti(easy->easy_handle, NULL); /* clear the association */
 
       if (easy->msg)
         free(easy->msg);