[GNUnet-SVN] [gnurl] 18/73: Revert "multi_done: wait for name resolve to finish if still ongoing"

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnurl.

commit b2df2d47e58d1150f11ea2f42aac6b84fa7f4d00
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sun Oct 8 00:50:33 2017 +0200

    Revert "multi_done: wait for name resolve to finish if still ongoing"
    
    This reverts commit f3e03f6c0ac52a1bf396e03f7d7e9b5b3b7165fe.
    
    Caused memory leaks in the fuzzer, needs to be done differently.
    
    Disable test 1553 for now too, as it causes memory leaks without this
    commit!
---
 lib/multi.c         | 6 ------
 tests/data/DISABLED | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/multi.c b/lib/multi.c
index c87515969..caceaf589 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -537,12 +537,6 @@ 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 */
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 11d54b463..fcbf0ffc4 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -18,3 +18,5 @@
 1510
 # Pipelining test that is causing false positives a little too often
 1903
+# causes memory leaks for now:
+1553

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