Revert "Handle ERRSIG in the gpgv method like BADSIG"

[apt.git] / methods / server.cc

diff --git a/methods/server.cc b/methods/server.cc
index d5188d4a31450a81248b7269b87b4edc24602a58..322b8d94ca1dfcdd98f20ff20715aa1659437a97 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -150,9 +150,15 @@ bool ServerState::HeaderLine(string Line)
       else
       {
         if (Major == 1 && Minor == 0)
+        {
            Persistent = false;
+        }
         else
+        {
            Persistent = true;
+           if (PipelineAllowed)
+              Pipeline = true;
+        }
       }
 
       return true;
@@ -240,7 +246,8 @@ bool ServerState::HeaderLine(string Line)
 }
                                                                        /*}}}*/
 // ServerState::ServerState - Constructor                              /*{{{*/
-ServerState::ServerState(URI Srv, ServerMethod *Owner) : ServerName(Srv), TimeOut(120), Owner(Owner)
+ServerState::ServerState(URI Srv, ServerMethod *Owner) :
+   DownloadSize(0), ServerName(Srv), TimeOut(120), Owner(Owner)
 {
    Reset();
 }
@@ -532,6 +539,7 @@ int ServerMethod::Loop()
            _error->Discard();
            Server->Close();
            Server->Pipeline = false;
+           Server->PipelineAllowed = false;
            
            if (FailCounter >= 2)
            {
@@ -604,6 +612,7 @@ int ServerMethod::Loop()
                           strprintf(out, _("Automatically disabled %s due to incorrect response from server/proxy. (man 5 apt.conf)"), "Acquire::http::PipelineDepth");
                           std::cerr << "W: " << out << std::endl;
                           Server->Pipeline = false;
+                          Server->PipelineAllowed = false;
                           // we keep the PipelineDepth value so that the rest of the queue can be fixed up as well
                        }
                        Rename(Res.Filename, I->DestFile);