From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Tue, 20 Jul 2021 18:24:30 +0000 (+0300)
Subject: Undone an out-of-scope change
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30f5bf82da45b87814562a92d0893d841bf53867;p=thirdparty%2Fsquid.git

Undone an out-of-scope change

Apart from Downloader, there are several other doneAll() methods
needing refactoring as well (e.g., ConnOpener::doneAll()). We
should refactor them all at once (probably in a separate PR).
---

diff --git a/src/Downloader.cc b/src/Downloader.cc
index de4038d36c..548b243045 100644
--- a/src/Downloader.cc
+++ b/src/Downloader.cc
@@ -94,7 +94,7 @@ Downloader::swanSong()
 bool
 Downloader::doneAll() const
 {
-    return !callback_;
+    return (!callback_ || callback_->canceled()) && AsyncJob::doneAll();
 }
 
 static void