* fixed a problem when it comes to the cache rebuilding

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 3bb29cde07d7c42d1658a01c2fe66d4d28617125..81a64d7a3f1e769ddf58a45cecdf7e51c35873ba 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -514,14 +514,14 @@ bool ServerState::HeaderLine(string Line)
       {
         if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor,
                    &Result,Code) != 4)
       {
         if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor,
                    &Result,Code) != 4)

-           return _error->Error(_("The http server sent an invalid reply header"));
+           return _error->Error(_("The HTTP server sent an invalid reply header"));

       }
       else
       {
         Major = 0;
         Minor = 9;
         if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2)
       }
       else
       {
         Major = 0;
         Minor = 9;
         if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2)

-           return _error->Error(_("The http server sent an invalid reply header"));
+           return _error->Error(_("The HTTP server sent an invalid reply header"));

       }
 
       /* Check the HTTP response header to get the default persistance
       }
 
       /* Check the HTTP response header to get the default persistance


@@ -550,7 +550,7 @@ bool ServerState::HeaderLine(string Line)
         return true;
       
       if (sscanf(Val.c_str(),"%lu",&Size) != 1)
         return true;
       
       if (sscanf(Val.c_str(),"%lu",&Size) != 1)

-        return _error->Error(_("The http server sent an invalid Content-Length header"));
+        return _error->Error(_("The HTTP server sent an invalid Content-Length header"));

       return true;
    }
 
       return true;
    }
 


@@ -565,9 +565,9 @@ bool ServerState::HeaderLine(string Line)
       HaveContent = true;
       
       if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
       HaveContent = true;
       
       if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)

-        return _error->Error(_("The http server sent an invalid Content-Range header"));
+        return _error->Error(_("The HTTP server sent an invalid Content-Range header"));

       if ((unsigned)StartPos > Size)
       if ((unsigned)StartPos > Size)

-        return _error->Error(_("This http server has broken range support"));
+        return _error->Error(_("This HTTP server has broken range support"));

       return true;
    }
    
       return true;
    }
    


@@ -829,7 +829,7 @@ bool HttpMethod::ServerDie(ServerState *Srv)
    {
       Srv->Close();
       if (LErrno == 0)
    {
       Srv->Close();
       if (LErrno == 0)

-        return _error->Error(_("Error reading from server Remote end closed connection"));
+        return _error->Error(_("Error reading from server. Remote end closed connection"));

       errno = LErrno;
       return _error->Errno("read",_("Error reading from server"));
    }
       errno = LErrno;
       return _error->Errno("read",_("Error reading from server"));
    }


@@ -1062,7 +1062,7 @@ int HttpMethod::Loop()
         // The header data is bad
         case 2:
         {
         // The header data is bad
         case 2:
         {

-           _error->Error(_("Bad header Data"));
+           _error->Error(_("Bad header data"));

            Fail(true);
            RotateDNS();
            continue;
            Fail(true);
            RotateDNS();
            continue;


@@ -1183,6 +1183,8 @@ int HttpMethod::Loop()
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    HttpMethod Mth;
    
    return Mth.Loop();
    HttpMethod Mth;
    
    return Mth.Loop();