Merge branch 'feature/acq-trans' into feature/expected-size

diff --combined apt-pkg/acquire-worker.cc
index ffa84eb68d30988fc471c209544ec3c2d9a513f9,4a357bdab884df1e2e1e4f1e8ff0ab3bf5427fc7..64df3c80fe13456734c86ea1e5d94f1fd6f141a8
--- 1/apt-pkg/acquire-worker.cc
--- 2/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@@ -371,7 -371,8 +371,8 @@@ bool pkgAcquire::Worker::RunMessages(
         {
            if (Itm == 0)
            {
-              _error->Error("Method gave invalid 400 URI Failure message");
+              std::string const msg = LookupTag(Message,"Message");
+              _error->Error("Method gave invalid 400 URI Failure message: %s", msg.c_str());
               break;
            }
  
@@@ -533,12 -534,6 +534,12 @@@ bool pkgAcquire::Worker::QueueItem(pkgA
     HashStringList const hsl = Item->Owner->HashSums();
     for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
        Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
 +   if(Item->Owner->FileSize > 0)
 +   {
 +      string MaximumSize;
 +      strprintf(MaximumSize, "%llu", Item->Owner->FileSize);
 +      Message += "\nMaximum-Size: " + MaximumSize;
 +   }
     Message += Item->Owner->Custom600Headers();
     Message += "\n\n";