From 23a1d783db529f7eff3b2db65cf2a3368faa227f Mon Sep 17 00:00:00 2001 From: Julian van den Berkmortel Date: Sun, 8 Nov 2020 21:53:03 +0100 Subject: [PATCH] Reject job within "HttpDownloader" when an exception is thrown, refs #9424 --- src/Composer/Util/HttpDownloader.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Composer/Util/HttpDownloader.php b/src/Composer/Util/HttpDownloader.php index b6b21cdaa..07eb22c24 100644 --- a/src/Composer/Util/HttpDownloader.php +++ b/src/Composer/Util/HttpDownloader.php @@ -268,10 +268,14 @@ class HttpDownloader return; } - if ($job['request']['copyTo']) { - $job['curl_id'] = $this->curl->download($resolve, $reject, $origin, $url, $options, $job['request']['copyTo']); - } else { - $job['curl_id'] = $this->curl->download($resolve, $reject, $origin, $url, $options); + try { + if ($job['request']['copyTo']) { + $job['curl_id'] = $this->curl->download($resolve, $reject, $origin, $url, $options, $job['request']['copyTo']); + } else { + $job['curl_id'] = $this->curl->download($resolve, $reject, $origin, $url, $options); + } + } catch (\Exception $exception) { + $reject($exception); } }