Upgrade curl to curl-7_66_0
Test: None
Change-Id: I3b08841f93c0f51cca6ec168fe43b891f2ad58f1
diff --git a/src/tool_main.c b/src/tool_main.c
index 7d1e62b..4803adb 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -113,9 +113,9 @@
strcpy(fname, env);
curl_free(env);
curl_dbg_memdebug(fname);
- /* this weird stuff here is to make curl_free() get called
- before curl_memdebug() as otherwise memory tracking will
- log a free() without an alloc! */
+ /* this weird stuff here is to make curl_free() get called before
+ curl_gdb_memdebug() as otherwise memory tracking will log a free()
+ without an alloc! */
}
/* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */
env = curlx_getenv("CURL_MEMLIMIT");
@@ -149,6 +149,7 @@
config->showerror = -1; /* Will show errors */
config->errors = stderr; /* Default errors to stderr */
config->styled_output = TRUE; /* enable detection */
+ config->parallel_max = PARALLEL_DEFAULT;
/* Allocate the initial operate config */
config->first = config->last = malloc(sizeof(struct OperationConfig));
@@ -160,19 +161,9 @@
result = get_libcurl_info();
if(!result) {
- /* Get a curl handle to use for all forthcoming curl transfers */
- config->easy = curl_easy_init();
- if(config->easy) {
- /* Initialise the config */
- config_init(config->first);
- config->first->easy = config->easy;
- config->first->global = config;
- }
- else {
- helpf(stderr, "error initializing curl easy handle\n");
- result = CURLE_FAILED_INIT;
- free(config->first);
- }
+ /* Initialise the config */
+ config_init(config->first);
+ config->first->global = config;
}
else {
helpf(stderr, "error retrieving curl library information\n");
@@ -214,9 +205,6 @@
static void main_free(struct GlobalConfig *config)
{
/* Cleanup the easy handle */
- curl_easy_cleanup(config->easy);
- config->easy = NULL;
-
/* Main cleanup */
curl_global_cleanup();
convert_cleanup();
