do not request files if we expect an IMS hit

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index 712e9ee7357295585bdb250dda9380934d0a8598..d2ddf6fcfdb204d3ede13915eae10d52223b9de3 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -70,19 +70,19 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
         {
            Hashes resultHashes(me->Itm->ExpectedHashes);
            FileFd file(me->Itm->DestFile, FileFd::ReadOnly);
         {
            Hashes resultHashes(me->Itm->ExpectedHashes);
            FileFd file(me->Itm->DestFile, FileFd::ReadOnly);

-           me->https->Server->Size = file.FileSize();
+           me->https->Server->TotalFileSize = file.FileSize();

            me->https->Server->Date = file.ModificationTime();
            resultHashes.AddFD(file);
            HashStringList const hashList = resultHashes.GetHashStringList();
            partialHit = (me->Itm->ExpectedHashes == hashList);
         }
            me->https->Server->Date = file.ModificationTime();
            resultHashes.AddFD(file);
            HashStringList const hashList = resultHashes.GetHashStringList();
            partialHit = (me->Itm->ExpectedHashes == hashList);
         }

-        else if (me->https->Server->Result == 416 && me->https->Server->Size == me->https->File->FileSize())
+        else if (me->https->Server->Result == 416 && me->https->Server->TotalFileSize == me->https->File->FileSize())

            partialHit = true;
 
         if (partialHit == true)
         {
            me->https->Server->Result = 200;
            partialHit = true;
 
         if (partialHit == true)
         {
            me->https->Server->Result = 200;

-           me->https->Server->StartPos = me->https->Server->Size;
+           me->https->Server->StartPos = me->https->Server->TotalFileSize;

            // the actual size is not important for https as curl will deal with it
            // by itself and e.g. doesn't bother us with transport-encoding…
            me->https->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
            // the actual size is not important for https as curl will deal with it
            // by itself and e.g. doesn't bother us with transport-encoding…
            me->https->Server->JunkSize = std::numeric_limits<unsigned long long>::max();


@@ -94,7 +94,7 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
         me->https->Server->StartPos = 0;
 
       me->Res->LastModified = me->https->Server->Date;
         me->https->Server->StartPos = 0;
 
       me->Res->LastModified = me->https->Server->Date;

-      me->Res->Size = me->https->Server->Size;
+      me->Res->Size = me->https->Server->TotalFileSize;

       me->Res->ResumePoint = me->https->Server->StartPos;
 
       // we expect valid data, so tell our caller we get the file now
       me->Res->ResumePoint = me->https->Server->StartPos;
 
       // we expect valid data, so tell our caller we get the file now


@@ -444,7 +444,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       char err[255];
       snprintf(err, sizeof(err) - 1, "HttpError%i", Server->Result);
       SetFailReason(err);
       char err[255];
       snprintf(err, sizeof(err) - 1, "HttpError%i", Server->Result);
       SetFailReason(err);

-      _error->Error("%s", err);
+      _error->Error("%i %s", Server->Result, Server->Code);

       // unlink, no need keep 401/404 page content in partial/
       unlink(File->Name().c_str());
       return false;
       // unlink, no need keep 401/404 page content in partial/
       unlink(File->Name().c_str());
       return false;