Merge with Michael AND update PO files

[ntk/apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 4521197..dc3f0b7 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: http.cc,v 1.54 2002/04/18 05:09:38 jgg Exp $
+// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -39,6 +39,7 @@
 #include <errno.h>
 #include <string.h>
 #include <iostream>
+#include <apti18n.h>
 
 // Internet stuff
 #include <netdb.h>
@@ -57,6 +58,12 @@ unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;
 bool Debug = false;
 
+
+unsigned long CircleBuf::BwReadLimit=0;
+unsigned long CircleBuf::BwTickReadData=0;
+struct timeval CircleBuf::BwReadTick={0,0};
+const unsigned int CircleBuf::BW_HZ=10;
+  
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -64,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
 {
    Buf = new unsigned char[Size];
    Reset();
+
+   CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
 }
                                                                        /*}}}*/
 // CircleBuf::Reset - Reset to the default state                       /*{{{*/
@@ -89,16 +98,45 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
+   unsigned long BwReadMax;
+
    while (1)
    {
       // Woops, buffer is full
       if (InP - OutP == Size)
         return true;
-      
+
+      // what's left to read in this tick
+      BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
+
+      if(CircleBuf::BwReadLimit) {
+        struct timeval now;
+        gettimeofday(&now,0);
+
+        unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+           now.tv_usec-CircleBuf::BwReadTick.tv_usec;
+        if(d > 1000000/BW_HZ) {
+           CircleBuf::BwReadTick = now;
+           CircleBuf::BwTickReadData = 0;
+        } 
+        
+        if(CircleBuf::BwTickReadData >= BwReadMax) {
+           usleep(1000000/BW_HZ);
+           return true;
+        }
+      }
+
       // Write the buffer segment
       int Res;
-      Res = read(Fd,Buf + (InP%Size),LeftRead());
+      if(CircleBuf::BwReadLimit) {
+        Res = read(Fd,Buf + (InP%Size), 
+                   BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
+      } else
+        Res = read(Fd,Buf + (InP%Size),LeftRead());
       
+      if(Res > 0 && BwReadLimit > 0) 
+        CircleBuf::BwTickReadData += Res;
+    
       if (Res == 0)
         return false;
       if (Res < 0)
@@ -202,13 +240,17 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
    {      
       if (Buf[I%Size] != '\n')
         continue;
-      for (I++; I < InP && Buf[I%Size] == '\r'; I++);
+      ++I;
+      if (I < InP  && Buf[I%Size] == '\r')
+         ++I;
       
       if (Single == false)
       {
         if (Buf[I%Size] != '\n')
            continue;
-        for (I++; I < InP && Buf[I%Size] == '\r'; I++);
+         ++I;
+         if (I < InP  && Buf[I%Size] == '\r')
+            ++I;
       }
       
       if (I > InP)
@@ -336,7 +378,7 @@ int ServerState::RunHeaders()
 {
    State = Header;
    
-   Owner->Status("Waiting for file");
+   Owner->Status(_("Waiting for headers"));
 
    Major = 0; 
    Minor = 0; 
@@ -482,7 +524,7 @@ bool ServerState::HeaderLine(string Line)
 
    // The http server might be trying to do something evil.
    if (Line.length() >= MAXLEN)
-      return _error->Error("Got a single header line over %u chars",MAXLEN);
+      return _error->Error(_("Got a single header line over %u chars"),MAXLEN);
 
    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
@@ -490,7 +532,7 @@ bool ServerState::HeaderLine(string Line)
       // Blah, some servers use "connection:closes", evil.
       Pos = Line.find(':');
       if (Pos == string::npos || Pos + 2 > Line.length())
-        return _error->Error("Bad header line");
+        return _error->Error(_("Bad header line"));
       Pos++;
    }
 
@@ -509,14 +551,14 @@ bool ServerState::HeaderLine(string Line)
       {
         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)
-           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
@@ -545,7 +587,7 @@ bool ServerState::HeaderLine(string Line)
         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;
    }
 
@@ -560,9 +602,9 @@ bool ServerState::HeaderLine(string Line)
       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)
-        return _error->Error("This http server has broken range support");
+        return _error->Error(_("This HTTP server has broken range support"));
       return true;
    }
    
@@ -586,7 +628,7 @@ bool ServerState::HeaderLine(string Line)
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
       if (StrToTime(Val,Date) == false)
-        return _error->Error("Unknown date format");
+        return _error->Error(_("Unknown date format"));
       return true;
    }
 
@@ -630,13 +672,13 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
                 and a no-store directive for archives. */
       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
              Itm->Uri.c_str(),ProperHost.c_str());
-      if (_config->FindB("Acquire::http::No-Cache",false) == true)
-        strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
-      else
+      // only generate a cache control header if we actually want to 
+      // use a cache
+      if (_config->FindB("Acquire::http::No-Cache",false) == false)
       {
         if (Itm->IndexFile == true)
            sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
-                   _config->FindI("Acquire::http::Max-Age",60*60*24));
+                   _config->FindI("Acquire::http::Max-Age",0));
         else
         {
            if (_config->FindB("Acquire::http::No-Store",false) == true)
@@ -644,6 +686,10 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
         }       
       }
    }
+   // generate a no-cache header if needed
+   if (_config->FindB("Acquire::http::No-Cache",false) == true)
+      strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
+
    
    string Req = Buf;
 
@@ -729,12 +775,12 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    {
       if (errno == EINTR)
         return true;
-      return _error->Errno("select","Select failed");
+      return _error->Errno("select",_("Select failed"));
    }
    
    if (Res == 0)
    {
-      _error->Error("Connection timed out");
+      _error->Error(_("Connection timed out"));
       return ServerDie(Srv);
    }
    
@@ -757,7 +803,7 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    if (FileFD != -1 && FD_ISSET(FileFD,&wfds))
    {
       if (Srv->In.Write(FileFD) == false)
-        return _error->Errno("write","Error writing to output file");
+        return _error->Errno("write",_("Error writing to output file"));
    }
 
    // Handle commands from APT
@@ -778,14 +824,17 @@ bool HttpMethod::Flush(ServerState *Srv)
 {
    if (File != 0)
    {
-      SetNonBlock(File->Fd(),false);
+      // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
+      // can't be set
+      if (File->Name() != "/dev/null")
+        SetNonBlock(File->Fd(),false);
       if (Srv->In.WriteSpace() == false)
         return true;
       
       while (Srv->In.WriteSpace() == true)
       {
         if (Srv->In.Write(File->Fd()) == false)
-           return _error->Errno("write","Error writing to file");
+           return _error->Errno("write",_("Error writing to file"));
         if (Srv->In.IsLimit() == true)
            return true;
       }
@@ -806,11 +855,14 @@ bool HttpMethod::ServerDie(ServerState *Srv)
    // Dump the buffer to the file
    if (Srv->State == ServerState::Data)
    {
-      SetNonBlock(File->Fd(),false);
+      // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
+      // can't be set
+      if (File->Name() != "/dev/null")
+        SetNonBlock(File->Fd(),false);
       while (Srv->In.WriteSpace() == true)
       {
         if (Srv->In.Write(File->Fd()) == false)
-           return _error->Errno("write","Error writing to the file");
+           return _error->Errno("write",_("Error writing to the file"));
 
         // Done
         if (Srv->In.IsLimit() == true)
@@ -824,9 +876,9 @@ bool HttpMethod::ServerDie(ServerState *Srv)
    {
       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");
+      return _error->Errno("read",_("Error reading from server"));
    }
    else
    {
@@ -908,7 +960,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       lseek(File->Fd(),0,SEEK_SET);
       if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
       {
-        _error->Errno("read","Problem hashing file");
+        _error->Errno("read",_("Problem hashing file"));
         return 5;
       }
       lseek(File->Fd(),0,SEEK_END);
@@ -1057,7 +1109,7 @@ int HttpMethod::Loop()
         // The header data is bad
         case 2:
         {
-           _error->Error("Bad header Data");
+           _error->Error(_("Bad header data"));
            Fail(true);
            RotateDNS();
            continue;
@@ -1074,7 +1126,7 @@ int HttpMethod::Loop()
            
            if (FailCounter >= 2)
            {
-              Fail("Connection failed",true);
+              Fail(_("Connection failed"),true);
               FailCounter = 0;
            }
            
@@ -1165,7 +1217,7 @@ int HttpMethod::Loop()
         }
         
         default:
-        Fail("Internal error");
+        Fail(_("Internal error"));
         break;
       }
       
@@ -1178,6 +1230,8 @@ int HttpMethod::Loop()
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    HttpMethod Mth;
    
    return Mth.Loop();