Use some semantically more correct buffer operations

[apt.git] / methods / server.cc

diff --git a/methods/server.cc b/methods/server.cc
index 650a4aeb8e3d19f1e92885ed2a99349a9114be8c..322b8d94ca1dfcdd98f20ff20715aa1659437a97 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -114,7 +114,7 @@ bool ServerState::HeaderLine(string Line)
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;

-   while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
+   while (Pos2 < Line.length() && isspace_ascii(Line[Pos2]) != 0)

       Pos2++;
 
    string Tag = string(Line,0,Pos);
       Pos2++;
 
    string Tag = string(Line,0,Pos);


@@ -150,9 +150,15 @@ bool ServerState::HeaderLine(string Line)
       else
       {
         if (Major == 1 && Minor == 0)
       else
       {
         if (Major == 1 && Minor == 0)

+        {

            Persistent = false;
            Persistent = false;

+        }

         else
         else

+        {

            Persistent = true;
            Persistent = true;

+           if (PipelineAllowed)
+              Pipeline = true;
+        }

       }
 
       return true;
       }
 
       return true;


@@ -240,7 +246,8 @@ bool ServerState::HeaderLine(string Line)
 }
                                                                        /*}}}*/
 // ServerState::ServerState - Constructor                              /*{{{*/
 }
                                                                        /*}}}*/
 // 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();
 }
 {
    Reset();
 }


@@ -252,17 +259,6 @@ bool ServerState::AddPartialFileToHashes(FileFd &File)                     /*{{{*/
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-bool ServerMethod::Configuration(string Message)                       /*{{{*/
-{
-   if (pkgAcqMethod::Configuration(Message) == false)
-      return false;
-
-   DropPrivsOrDie();
-
-   return true;
-}
-                                                                       /*}}}*/
-

 // ServerMethod::DealWithHeaders - Handle the retrieved header data    /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what
 // ServerMethod::DealWithHeaders - Handle the retrieved header data    /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what


@@ -543,6 +539,7 @@ int ServerMethod::Loop()
            _error->Discard();
            Server->Close();
            Server->Pipeline = false;
            _error->Discard();
            Server->Close();
            Server->Pipeline = false;

+           Server->PipelineAllowed = false;

            
            if (FailCounter >= 2)
            {
            
            if (FailCounter >= 2)
            {


@@ -615,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;
                           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);
                           // we keep the PipelineDepth value so that the rest of the queue can be fixed up as well
                        }
                        Rename(Res.Filename, I->DestFile);


@@ -753,8 +751,8 @@ unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const       /*{{{*/
    return MaxSizeInQueue;
 }
                                                                        /*}}}*/
    return MaxSizeInQueue;
 }
                                                                        /*}}}*/

-ServerMethod::ServerMethod(const char *Ver,unsigned long Flags) :      /*{{{*/
-   pkgAcqMethod(Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10),
+ServerMethod::ServerMethod(char const * const Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/
+   aptMethod(Binary, Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10),

    AllowRedirect(false), Debug(false)
 {
 }
    AllowRedirect(false), Debug(false)
 {
 }