Merge remote-tracking branch 'donkult/feature/acq-trans' into feature/expected-size

diff --combined apt-pkg/acquire-method.cc
index 9c0558223dfaa659a567d4bdba3082dc40a713b2,cbcbea247f38f5e1e4a4a8b5c309e7c0bf367956..c78e95e58959fdfeed64ad25c45c45ea90652ae9
--- 1/apt-pkg/acquire-method.cc
--- 2/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@@ -102,7 -102,10 +102,10 @@@ void pkgAcqMethod::Fail(string Err,boo
     if (Queue != 0)
     {
        std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n"
-               << "Message: " << Err << " " << IP << "\n";
+               << "Message: " << Err;
+       if (IP.empty() == false && _config->FindB("Acquire::Failure::ShowIP", true) == true)
+        std::cout << " " << IP;
+       std::cout << "\n";
        Dequeue();
     }
     else
@@@ -372,8 -375,6 +375,8 @@@ int pkgAcqMethod::Run(bool Single
               if (hash.empty() == false)
                  Tmp->ExpectedHashes.push_back(HashString(*t, hash));
            }
 +            char *End;
 +            Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);
            Tmp->Next = 0;
            
            // Append it to the list