diff --git a/src/download.c b/src/download.c index 86b9ae24..3e08e9d0 100644 --- a/src/download.c +++ b/src/download.c @@ -135,7 +135,7 @@ static size_t file_hash_value(const void *data) return HASH_VALUE(((struct file *)data)->hash[0]); } -int start_full_download(bool pipelining) +int start_full_download(void) { if (swupd_curl_hashmap) { return -1; @@ -149,17 +149,7 @@ int start_full_download(bool pipelining) return -1; } - /* - * we want to not do HTTP pipelining once things have failed once.. in case some transpoxy in the middle - * is even more broken than average. This at least will allow the user to update, albeit slowly. - */ - if (pipelining) { - curl_multi_setopt(mcurl, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX | CURLPIPE_HTTP1); - } else { - /* survival: don't go too parallel in verify/fix loop */ - MAX_XFER = 1; - MAX_XFER_BOTTOM = 1; - } + curl_multi_setopt(mcurl, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX | CURLPIPE_HTTP1); fprintf(stderr, "Starting download of remaining update content. This may take a while...\n"); diff --git a/src/fullfile.c b/src/fullfile.c index 8c7033cb..45701958 100644 --- a/src/fullfile.c +++ b/src/fullfile.c @@ -90,7 +90,7 @@ int download_fullfiles(struct list *files, int num_retries, int timeout) int retries = 0; while (files) { - ret = start_full_download(true); + ret = start_full_download(); if (ret != 0) { /* If we hit this point, the network is accessible but we were * unable to download the needed files. This is a terminal error diff --git a/src/swupd.h b/src/swupd.h index 30b84615..b0614763 100644 --- a/src/swupd.h +++ b/src/swupd.h @@ -283,7 +283,7 @@ extern int download_subscribed_packs(struct list *subs, struct manifest *mom, bo extern void apply_deltas(struct manifest *current_manifest); extern void full_download(struct file *file); -extern int start_full_download(bool pipelining); +extern int start_full_download(void); extern struct list *end_full_download(void); extern int untar_full_download(void *data);