aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-10-08 00:50:33 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-10-08 00:55:10 +0200
commitb2df2d47e58d1150f11ea2f42aac6b84fa7f4d00 (patch)
tree95ed2d2b72a2573e6585b7ddd3e622f9449a8a3e
parent1e552535e1762acd36c930299b46829e58eb1583 (diff)
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!
-rw-r--r--lib/multi.c6
-rw-r--r--tests/data/DISABLED2
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