summaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-08-21 10:01:53 +0200
committerGitHub <noreply@github.com>2018-08-21 10:01:53 +0200
commit06d142b962c7313e5bad3b50a44166eaa080314f (patch)
treeddcc0d3a6102784a10c1b7ee53670ef61b9909cb /lib/multi.c
parent53bda2af6ce340fa071c243d60091877886c2873 (diff)
parente29ff2be2f4ae0dace025672e0289104d58adb2a (diff)
downloadcurl-06d142b962c7313e5bad3b50a44166eaa080314f.tar.gz
Merge branch 'master' into bagder/http2-easymapbagder/http2-easymap
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/multi.c b/lib/multi.c
index c2c5e1c27..0caf94322 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -592,6 +592,7 @@ static CURLcode multi_done(struct connectdata **connp,
conn->dns_entry = NULL;
}
Curl_hostcache_prune(data);
+ Curl_safefree(data->state.ulbuf);
/* if the transfer was completed in a paused state there can be buffered
data left to free */
@@ -1575,6 +1576,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
multistate(data, CURLM_STATE_SENDPROTOCONNECT);
}
}
+ else if(result)
+ stream_error = TRUE;
break;
#endif