]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Undone an out-of-scope change
authorEduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Tue, 20 Jul 2021 18:24:30 +0000 (21:24 +0300)
committerEduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Tue, 20 Jul 2021 18:24:30 +0000 (21:24 +0300)
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).

src/Downloader.cc

index de4038d36ca13e8985488ba362df8b7dc885b8f3..548b243045a08c4377f1846b4e3a6a37bb243c65 100644 (file)
@@ -94,7 +94,7 @@ Downloader::swanSong()
 bool
 Downloader::doneAll() const
 {
-    return !callback_;
+    return (!callback_ || callback_->canceled()) && AsyncJob::doneAll();
 }
 
 static void