fix the testcases which were broken by the new space between number and unit

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 904030e0a83d4115f619fd68f6d9e37882c072c7..25e31de9a3126becc17db843f4e4e59a2a1837c5 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -67,7 +67,7 @@ unsigned long CircleBuf::BwReadLimit=0;
 unsigned long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
 unsigned long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;

-  
+ 

 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -378,7 +378,7 @@ bool ServerState::Close()
 // ---------------------------------------------------------------------
 /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
    parse error occurred */
 // ---------------------------------------------------------------------
 /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
    parse error occurred */

-int ServerState::RunHeaders()
+ServerState::RunHeadersResult ServerState::RunHeaders()

 {
    State = Header;
    
 {
    State = Header;
    


@@ -407,7 +407,7 @@ int ServerState::RunHeaders()
         string::const_iterator J = I;
         for (; J != Data.end() && *J != '\n' && *J != '\r';J++);
         if (HeaderLine(string(I,J)) == false)
         string::const_iterator J = I;
         for (; J != Data.end() && *J != '\n' && *J != '\r';J++);
         if (HeaderLine(string(I,J)) == false)

-           return 2;
+           return RUN_HEADERS_PARSE_ERROR;

         I = J;
       }
 
         I = J;
       }
 


@@ -419,11 +419,11 @@ int ServerState::RunHeaders()
       if (Encoding == Closes && HaveContent == true)
         Persistent = false;
       
       if (Encoding == Closes && HaveContent == true)
         Persistent = false;
       

-      return 0;
+      return RUN_HEADERS_OK;

    }
    while (Owner->Go(false,this) == true);
    
    }
    while (Owner->Go(false,this) == true);
    

-   return 1;
+   return RUN_HEADERS_IO_ERROR;

 }
                                                                        /*}}}*/
 // ServerState::RunData - Transfer the data from the socket            /*{{{*/
 }
                                                                        /*}}}*/
 // ServerState::RunData - Transfer the data from the socket            /*{{{*/


@@ -553,8 +553,14 @@ bool ServerState::HeaderLine(string Line)
       // Evil servers return no version
       if (Line[4] == '/')
       {
       // Evil servers return no version
       if (Line[4] == '/')
       {

-        if (sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor,
-                   &Result,Code) != 4)
+        int const elements = sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor,&Result,Code);
+        if (elements == 3)
+        {
+           Code[0] = '\0';
+           if (Debug == true)
+              clog << "HTTP server doesn't give Reason-Phrase for " << Result << std::endl;
+        }
+        else if (elements != 4)

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


@@ -631,7 +637,7 @@ bool ServerState::HeaderLine(string Line)
    
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
    
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {

-      if (StrToTime(Val,Date) == false)
+      if (RFC1123StrToTime(Val.c_str(), Date) == false)

         return _error->Error(_("Unknown date format"));
       return true;
    }
         return _error->Error(_("Unknown date format"));
       return true;
    }


@@ -734,7 +740,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",

-               "Ubuntu APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
+               "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";

    
    if (Debug == true)
       cerr << Req << endl;
    
    if (Debug == true)
       cerr << Req << endl;


@@ -914,15 +920,10 @@ bool HttpMethod::ServerDie(ServerState *Srv)
 // HttpMethod::DealWithHeaders - Handle the retrieved header data      /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what
 // HttpMethod::DealWithHeaders - Handle the retrieved header data      /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what

-   to do. Returns 
-     0 - File is open,
-     1 - IMS hit
-     3 - Unrecoverable error 
-     4 - Error with error content page
-     5 - Unrecoverable non-server error (close the connection) 
-     6 - Try again with a new or changed URI
+   to do. Returns DealWithHeadersResult (see http.h for details).

  */
  */

-int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
+HttpMethod::DealWithHeadersResult
+HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)

 {
    // Not Modified
    if (Srv->Result == 304)
 {
    // Not Modified
    if (Srv->Result == 304)


@@ -930,7 +931,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       unlink(Queue->DestFile.c_str());
       Res.IMSHit = true;
       Res.LastModified = Queue->LastModified;
       unlink(Queue->DestFile.c_str());
       Res.IMSHit = true;
       Res.LastModified = Queue->LastModified;

-      return 1;
+      return IMS_HIT;

    }
    
    /* Redirect
    }
    
    /* Redirect


@@ -949,7 +950,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       if (!Srv->Location.empty())
       {
          NextURI = Srv->Location;
       if (!Srv->Location.empty())
       {
          NextURI = Srv->Location;

-         return 6;
+         return TRY_AGAIN_OR_REDIRECT;

       }
       /* else pass through for error message */
    }
       }
       /* else pass through for error message */
    }


@@ -963,8 +964,8 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       SetFailReason(err);
       _error->Error("%u %s",Srv->Result,Srv->Code);
       if (Srv->HaveContent == true)
       SetFailReason(err);
       _error->Error("%u %s",Srv->Result,Srv->Code);
       if (Srv->HaveContent == true)

-        return 4;
-      return 3;
+        return ERROR_WITH_CONTENT_PAGE;
+      return ERROR_UNRECOVERABLE;

    }
 
    // This is some sort of 2xx 'data follows' reply
    }
 
    // This is some sort of 2xx 'data follows' reply


@@ -975,7 +976,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
    delete File;
    File = new FileFd(Queue->DestFile,FileFd::WriteAny);
    if (_error->PendingError() == true)
    delete File;
    File = new FileFd(Queue->DestFile,FileFd::WriteAny);
    if (_error->PendingError() == true)

-      return 5;
+      return ERROR_NOT_FROM_SERVER;

 
    FailFile = Queue->DestFile;
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
 
    FailFile = Queue->DestFile;
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler


@@ -1003,13 +1004,13 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
       {
         _error->Errno("read",_("Problem hashing file"));
       if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
       {
         _error->Errno("read",_("Problem hashing file"));

-        return 5;
+        return ERROR_NOT_FROM_SERVER;

       }
       lseek(File->Fd(),0,SEEK_END);
    }
    
    SetNonBlock(File->Fd(),true);
       }
       lseek(File->Fd(),0,SEEK_END);
    }
    
    SetNonBlock(File->Fd(),true);

-   return 0;
+   return FILE_IS_OPEN;

 }
                                                                        /*}}}*/
 // HttpMethod::SigTerm - Handle a fatal signal                         /*{{{*/
 }
                                                                        /*}}}*/
 // HttpMethod::SigTerm - Handle a fatal signal                         /*{{{*/


@@ -1037,7 +1038,7 @@ void HttpMethod::SigTerm(int)
    depth. */
 bool HttpMethod::Fetch(FetchItem *)
 {
    depth. */
 bool HttpMethod::Fetch(FetchItem *)
 {

-   if (Server == 0) 
+   if (Server == 0)

       return true;
 
    // Queue the requests
       return true;
 
    // Queue the requests


@@ -1150,11 +1151,11 @@ int HttpMethod::Loop()
       // Fetch the next URL header data from the server.
       switch (Server->RunHeaders())
       {
       // Fetch the next URL header data from the server.
       switch (Server->RunHeaders())
       {

-        case 0:
+        case ServerState::RUN_HEADERS_OK:

         break;
         
         // The header data is bad
         break;
         
         // The header data is bad

-        case 2:
+        case ServerState::RUN_HEADERS_PARSE_ERROR:

         {
            _error->Error(_("Bad header data"));
            Fail(true);
         {
            _error->Error(_("Bad header data"));
            Fail(true);


@@ -1164,7 +1165,7 @@ int HttpMethod::Loop()
         
         // The server closed a connection during the header get..
         default:
         
         // The server closed a connection during the header get..
         default:

-        case 1:
+        case ServerState::RUN_HEADERS_IO_ERROR:

         {
            FailCounter++;
            _error->Discard();
         {
            FailCounter++;
            _error->Discard();


@@ -1188,7 +1189,7 @@ int HttpMethod::Loop()
       switch (DealWithHeaders(Res,Server))
       {
         // Ok, the file is Open
       switch (DealWithHeaders(Res,Server))
       {
         // Ok, the file is Open

-        case 0:
+        case FILE_IS_OPEN:

         {
            URIStart(Res);
 
         {
            URIStart(Res);
 


@@ -1241,21 +1242,21 @@ int HttpMethod::Loop()
         }
         
         // IMS hit
         }
         
         // IMS hit

-        case 1:
+        case IMS_HIT:

         {
            URIDone(Res);
            break;
         }
         
         // Hard server error, not found or something
         {
            URIDone(Res);
            break;
         }
         
         // Hard server error, not found or something

-        case 3:
+        case ERROR_UNRECOVERABLE:

         {
            Fail();
            break;
         }
          
         // Hard internal error, kill the connection and fail
         {
            Fail();
            break;
         }
          
         // Hard internal error, kill the connection and fail

-        case 5:
+        case ERROR_NOT_FROM_SERVER:

         {
            delete File;
            File = 0;
         {
            delete File;
            File = 0;


@@ -1267,7 +1268,7 @@ int HttpMethod::Loop()
         }
 
         // We need to flush the data, the header is like a 404 w/ error text
         }
 
         // We need to flush the data, the header is like a 404 w/ error text

-        case 4:
+        case ERROR_WITH_CONTENT_PAGE:

         {
            Fail();
            
         {
            Fail();
            


@@ -1280,7 +1281,7 @@ int HttpMethod::Loop()
         }
         
          // Try again with a new URL
         }
         
          // Try again with a new URL

-         case 6:
+         case TRY_AGAIN_OR_REDIRECT:

          {
             // Clear rest of response if there is content
             if (Server->HaveContent)
          {
             // Clear rest of response if there is content
             if (Server->HaveContent)