* apt-pkg/acquire-worker.cc:

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 4e659ccd625b929de6cc7ba3e78cce7a7439d235..006e89394a5282e7bc7c0125a638030fe41a5627 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,20 +1,18 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: http.cc,v 1.33 1999/05/28 07:04:45 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.
+   HTTP Acquire Method - This is the HTTP aquire method for APT.

    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    
    It uses HTTP/1.1 and many of the fancy options there-in, such as

-   pipelining, range, if-range and so on. It accepts on the command line
-   a list of url destination pairs and writes to stdout the status of the
-   operation as defined in the APT method spec.
-   
-   It is based on a doubly buffered select loop. All the requests are 
+   pipelining, range, if-range and so on. 
+
+   It is based on a doubly buffered select loop. A groupe of requests are 

    fed into a single output buffer that is constantly fed out the 
    socket. This provides ideal pipelining as in many cases all of the
    requests will fit into a single packet. The input socket is buffered 
    fed into a single output buffer that is constantly fed out the 
    socket. This provides ideal pipelining as in many cases all of the
    requests will fit into a single packet. The input socket is buffered 

-   the same way and fed into the fd for the file.
+   the same way and fed into the fd for the file (may be a pipe in future).

    
    This double buffering provides fairly substantial transfer rates,
    compared to wget the http method is about 4% faster. Most importantly,
    
    This double buffering provides fairly substantial transfer rates,
    compared to wget the http method is about 4% faster. Most importantly,


@@ -30,7 +28,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/md5.h>
+#include <apt-pkg/hashes.h>

 
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>


@@ -39,31 +37,45 @@
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>

+#include <string.h>
+#include <iostream>
+#include <map>
+#include <apti18n.h>

 
 // Internet stuff
 
 // Internet stuff

-/*#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>*/
+#include <netdb.h>

 
 

+#include "config.h"
+#include "connect.h"

 #include "rfc2553emu.h"
 #include "http.h"
 
                                                                        /*}}}*/
 #include "rfc2553emu.h"
 #include "http.h"
 
                                                                        /*}}}*/

+using namespace std;

 
 string HttpMethod::FailFile;
 int HttpMethod::FailFd = -1;
 time_t HttpMethod::FailTime = 0;
 unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;
 
 string HttpMethod::FailFile;
 int HttpMethod::FailFd = -1;
 time_t HttpMethod::FailTime = 0;
 unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;

+bool AllowRedirect = false;
+bool Debug = false;
+URI Proxy;

 
 

+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                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CircleBuf::CircleBuf(unsigned long Size) : Size(Size), MD5(0)
+CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)

 {
    Buf = new unsigned char[Size];
    Reset();
 {
    Buf = new unsigned char[Size];
    Reset();

+
+   CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;

 }
                                                                        /*}}}*/
 // CircleBuf::Reset - Reset to the default state                       /*{{{*/
 }
                                                                        /*}}}*/
 // CircleBuf::Reset - Reset to the default state                       /*{{{*/


@@ -76,10 +88,10 @@ void CircleBuf::Reset()
    StrPos = 0;
    MaxGet = (unsigned int)-1;
    OutQueue = string();
    StrPos = 0;
    MaxGet = (unsigned int)-1;
    OutQueue = string();

-   if (MD5 != 0)
+   if (Hash != 0)

    {
    {

-      delete MD5;
-      MD5 = new MD5Summation;
+      delete Hash;
+      Hash = new Hashes;

    }   
 };
                                                                        /*}}}*/
    }   
 };
                                                                        /*}}}*/


@@ -89,16 +101,45 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

+   unsigned long BwReadMax;
+

    while (1)
    {
       // Woops, buffer is full
       if (InP - OutP == Size)
         return true;
    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;
       // 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)
       if (Res == 0)
         return false;
       if (Res < 0)


@@ -141,7 +182,7 @@ void CircleBuf::FillOut()
       unsigned long Sz = LeftRead();
       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;
       unsigned long Sz = LeftRead();
       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;

-      memcpy(Buf + (InP%Size),OutQueue.begin() + StrPos,Sz);
+      memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);

       
       // Advance
       StrPos += Sz;
       
       // Advance
       StrPos += Sz;


@@ -185,8 +226,8 @@ bool CircleBuf::Write(int Fd)
         return false;
       }
       
         return false;
       }
       

-      if (MD5 != 0)
-        MD5->Add(Buf + (OutP%Size),Res);
+      if (Hash != 0)
+        Hash->Add(Buf + (OutP%Size),Res);

       
       OutP += Res;
    }
       
       OutP += Res;
    }


@@ -202,25 +243,24 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
    {      
       if (Buf[I%Size] != '\n')
         continue;
    {      
       if (Buf[I%Size] != '\n')
         continue;

-      for (I++; I < InP && Buf[I%Size] == '\r'; I++);
+      ++I;

       
       if (Single == false)
       {
       
       if (Single == false)
       {

-        if (Buf[I%Size] != '\n')
-           continue;
-        for (I++; I < InP && Buf[I%Size] == '\r'; I++);
+         if (I < InP  && Buf[I%Size] == '\r')
+            ++I;
+         if (I >= InP || Buf[I%Size] != '\n')
+            continue;
+         ++I;

       }
       
       }
       

-      if (I > InP)
-        I = InP;
-      

       Data = "";
       while (OutP < I)
       {
         unsigned long Sz = LeftWrite();
         if (Sz == 0)
            return false;
       Data = "";
       while (OutP < I)
       {
         unsigned long Sz = LeftWrite();
         if (Sz == 0)
            return false;

-        if (I - OutP < LeftWrite())
+        if (I - OutP < Sz)

            Sz = I - OutP;
         Data += string((char *)(Buf + (OutP%Size)),Sz);
         OutP += Sz;
            Sz = I - OutP;
         Data += string((char *)(Buf + (OutP%Size)),Sz);
         OutP += Sz;


@@ -259,9 +299,6 @@ ServerState::ServerState(URI Srv,HttpMethod *Owner) : Owner(Owner),
 // ServerState::Open - Open a connection to the server                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens a connection to the server. */
 // ServerState::Open - Open a connection to the server                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This opens a connection to the server. */

-string LastHost;
-int LastPort = 0;
-struct addrinfo *LastHostAddr = 0;

 bool ServerState::Open()
 {
    // Use the already open connection if possible.
 bool ServerState::Open()
 {
    // Use the already open connection if possible.


@@ -271,7 +308,8 @@ bool ServerState::Open()
    Close();
    In.Reset();
    Out.Reset();
    Close();
    In.Reset();
    Out.Reset();

-
+   Persistent = true;
+   

    // Determine the proxy setting
    if (getenv("http_proxy") == 0)
    {
    // Determine the proxy setting
    if (getenv("http_proxy") == 0)
    {


@@ -290,10 +328,17 @@ bool ServerState::Open()
    else
       Proxy = getenv("http_proxy");
    
    else
       Proxy = getenv("http_proxy");
    

+   // Parse no_proxy, a , separated list of domains
+   if (getenv("no_proxy") != 0)
+   {
+      if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+        Proxy = "";
+   }
+   

    // Determine what host and port to use based on the proxy settings
    int Port = 0;
    string Host;   
    // Determine what host and port to use based on the proxy settings
    int Port = 0;
    string Host;   

-   if (Proxy.empty() == true)
+   if (Proxy.empty() == true || Proxy.Host.empty() == true)

    {
       if (ServerName.Port != 0)
         Port = ServerName.Port;
    {
       if (ServerName.Port != 0)
         Port = ServerName.Port;


@@ -306,67 +351,9 @@ bool ServerState::Open()
       Host = Proxy.Host;
    }
    
       Host = Proxy.Host;
    }
    

-   /* We used a cached address record.. Yes this is against the spec but
-      the way we have setup our rotating dns suggests that this is more
-      sensible */
-   if (LastHost != Host || LastPort != Port)
-   {
-      Owner->Status("Connecting to %s",Host.c_str());
-
-      // Lookup the host
-      char S[30] = "http";
-      if (Port != 0)
-        snprintf(S,sizeof(S),"%u",Port);
-
-      // Free the old address structure
-      if (LastHostAddr != 0)
-      {
-        freeaddrinfo(LastHostAddr);
-        LastHostAddr = 0;
-      }
-      
-      // We only understand SOCK_STREAM sockets.
-      struct addrinfo Hints;
-      memset(&Hints,0,sizeof(Hints));
-      Hints.ai_socktype = SOCK_STREAM;
-      
-      // Resolve both the host and service simultaneously
-      if (getaddrinfo(Host.c_str(),S,&Hints,&LastHostAddr) != 0 ||
-         LastHostAddr == 0)
-        return _error->Error("Could not resolve '%s'",Host.c_str());
-
-      LastHost = Host;
-      LastPort = Port;
-   }
-
-   // Get the printable IP address
-   char Name[NI_MAXHOST];
-   Name[0] = 0;
-   getnameinfo(LastHostAddr->ai_addr,LastHostAddr->ai_addrlen,
-              Name,sizeof(Name),0,0,NI_NUMERICHOST);
-   Owner->Status("Connecting to %s (%s)",Host.c_str(),Name);
-   
-   // Get a socket
-   if ((ServerFd = socket(LastHostAddr->ai_family,LastHostAddr->ai_socktype,
-                         LastHostAddr->ai_protocol)) < 0)
-      return _error->Errno("socket","Could not create a socket");
-   SetNonBlock(ServerFd,true);
-   if (connect(ServerFd,LastHostAddr->ai_addr,LastHostAddr->ai_addrlen) < 0 &&
-       errno != EINPROGRESS)
-      return _error->Errno("connect","Cannot initiate the connection "
-                          "to %s (%s).",Host.c_str(),Name);
-
-   /* This implements a timeout for connect by opening the connection
-      nonblocking */
-   if (WaitFd(ServerFd,true,TimeOut) == false)
-      return _error->Error("Could not connect to %s (%s), "
-                          "connection timed out",Host.c_str(),Name);
-   unsigned int Err;
-   unsigned int Len = sizeof(Err);
-   if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
-      return _error->Errno("getsockopt","Failed");
-   if (Err != 0)
-      return _error->Error("Could not connect to %s (%s).",Host.c_str(),Name);
+   // Connect to the remote server
+   if (Connect(Host,Port,"http",80,ServerFd,TimeOut,Owner) == false)
+      return false;

    
    return true;
 }
    
    return true;
 }


@@ -383,13 +370,13 @@ bool ServerState::Close()
                                                                        /*}}}*/
 // ServerState::RunHeaders - Get the headers before the data           /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ServerState::RunHeaders - Get the headers before the data           /*{{{*/
 // ---------------------------------------------------------------------

-/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header
-   parse error occured */
+/* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
+   parse error occurred */

 int ServerState::RunHeaders()
 {
    State = Header;
    
 int ServerState::RunHeaders()
 {
    State = Header;
    

-   Owner->Status("Waiting for file");
+   Owner->Status(_("Waiting for headers"));

 
    Major = 0; 
    Minor = 0; 
 
    Major = 0; 
    Minor = 0; 


@@ -405,19 +392,31 @@ int ServerState::RunHeaders()
       string Data;
       if (In.WriteTillEl(Data) == false)
         continue;
       string Data;
       if (In.WriteTillEl(Data) == false)
         continue;

+
+      if (Debug == true)
+        clog << Data;

       
       for (string::const_iterator I = Data.begin(); I < Data.end(); I++)
       {
         string::const_iterator J = I;
         for (; J != Data.end() && *J != '\n' && *J != '\r';J++);
       
       for (string::const_iterator I = Data.begin(); I < Data.end(); I++)
       {
         string::const_iterator J = I;
         for (; J != Data.end() && *J != '\n' && *J != '\r';J++);

-        if (HeaderLine(string(I,J-I)) == false)
+        if (HeaderLine(string(I,J)) == false)

            return 2;
         I = J;
       }
            return 2;
         I = J;
       }

+
+      // 100 Continue is a Nop...
+      if (Result == 100)
+        continue;
+      
+      // Tidy up the connection persistance state.
+      if (Encoding == Closes && HaveContent == true)
+        Persistent = false;
+      

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

-
+   

    return 1;
 }
                                                                        /*}}}*/
    return 1;
 }
                                                                        /*}}}*/


@@ -523,7 +522,7 @@ bool ServerState::HeaderLine(string Line)
 
    // The http server might be trying to do something evil.
    if (Line.length() >= MAXLEN)
 
    // 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())
 
    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())


@@ -531,7 +530,7 @@ bool ServerState::HeaderLine(string Line)
       // Blah, some servers use "connection:closes", evil.
       Pos = Line.find(':');
       if (Pos == string::npos || Pos + 2 > Line.length())
       // 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++;
    }
 
       Pos++;
    }
 


@@ -543,23 +542,35 @@ bool ServerState::HeaderLine(string Line)
    string Tag = string(Line,0,Pos);
    string Val = string(Line,Pos2);
    
    string Tag = string(Line,0,Pos);
    string Val = string(Line,Pos2);
    

-   if (stringcasecmp(Tag.begin(),Tag.begin()+4,"HTTP") == 0)
+   if (stringcasecmp(Tag.c_str(),Tag.c_str()+4,"HTTP") == 0)

    {
       // Evil servers return no version
       if (Line[4] == '/')
       {
         if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor,
                    &Result,Code) != 4)
    {
       // Evil servers return no version
       if (Line[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
+         state. */
+      if (Major < 1)
+        Persistent = false;
+      else
+      {
+        if (Major == 1 && Minor <= 0)
+           Persistent = false;
+        else
+           Persistent = true;
+      }
+

       return true;
    }      
       
       return true;
    }      
       


@@ -574,7 +585,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;
    }
 


@@ -589,9 +600,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;
    }
    


@@ -599,15 +610,29 @@ bool ServerState::HeaderLine(string Line)
    {
       HaveContent = true;
       if (stringcasecmp(Val,"chunked") == 0)
    {
       HaveContent = true;
       if (stringcasecmp(Val,"chunked") == 0)

-        Encoding = Chunked;
-      
+        Encoding = Chunked;      

       return true;
    }
 
       return true;
    }
 

+   if (stringcasecmp(Tag,"Connection:") == 0)
+   {
+      if (stringcasecmp(Val,"close") == 0)
+        Persistent = false;
+      if (stringcasecmp(Val,"keep-alive") == 0)
+        Persistent = true;
+      return true;
+   }
+   

    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
       if (StrToTime(Val,Date) == false)
    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;
+   }
+
+   if (stringcasecmp(Tag,"Location:") == 0)
+   {
+      Location = Val;

       return true;
    }
 
       return true;
    }
 


@@ -641,7 +666,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       will glitch HTTP/1.0 proxies because they do not filter it out and 
       pass it on, HTTP/1.1 says the connection should default to keep alive
       and we expect the proxy to do this */
       will glitch HTTP/1.0 proxies because they do not filter it out and 
       pass it on, HTTP/1.1 says the connection should default to keep alive
       and we expect the proxy to do this */

-   if (Proxy.empty() == true)
+   if (Proxy.empty() == true || Proxy.Host.empty())

       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
              QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
    else
       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
              QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
    else


@@ -651,13 +676,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());
                 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",
       {
         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)
         else
         {
            if (_config->FindB("Acquire::http::No-Store",false) == true)


@@ -665,6 +690,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;
 
    
    string Req = Buf;
 


@@ -673,7 +702,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       // In this case we send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       // In this case we send an if-range query with a range header

-      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",SBuf.st_size - 1,
+      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",(long)SBuf.st_size - 1,

              TimeRFC1123(SBuf.st_mtime).c_str());
       Req += Buf;
    }
              TimeRFC1123(SBuf.st_mtime).c_str());
       Req += Buf;
    }


@@ -690,8 +719,14 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       Req += string("Proxy-Authorization: Basic ") + 
           Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
 
       Req += string("Proxy-Authorization: Basic ") + 
           Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
 

-   Req += "User-Agent: Debian APT-HTTP/1.2\r\n\r\n";
-//   cerr << Req << endl;
+   if (Uri.User.empty() == false || Uri.Password.empty() == false)
+      Req += string("Authorization: Basic ") + 
+          Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
+   
+   Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
+   
+   if (Debug == true)
+      cerr << Req << endl;

 
    Out.Read(Req);
 }
 
    Out.Read(Req);
 }


@@ -703,18 +738,20 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
 bool HttpMethod::Go(bool ToFile,ServerState *Srv)
 {
    // Server has closed the connection
 bool HttpMethod::Go(bool ToFile,ServerState *Srv)
 {
    // Server has closed the connection

-   if (Srv->ServerFd == -1 && Srv->In.WriteSpace() == false)
+   if (Srv->ServerFd == -1 && (Srv->In.WriteSpace() == false || 
+                              ToFile == false))

       return false;
    
       return false;
    

-   fd_set rfds,wfds,efds;
+   fd_set rfds,wfds;

    FD_ZERO(&rfds);
    FD_ZERO(&wfds);
    FD_ZERO(&rfds);
    FD_ZERO(&wfds);

-   FD_ZERO(&efds);

    
    

-   // Add the server
-   if (Srv->Out.WriteSpace() == true && Srv->ServerFd != -1) 
+   /* Add the server. We only send more requests if the connection will 
+      be persisting */
+   if (Srv->Out.WriteSpace() == true && Srv->ServerFd != -1 
+       && Srv->Persistent == true)

       FD_SET(Srv->ServerFd,&wfds);
       FD_SET(Srv->ServerFd,&wfds);

-   if (Srv->In.ReadSpace() == true && Srv->ServerFd != -1) 
+   if (Srv->In.ReadSpace() == true && Srv->ServerFd != -1)

       FD_SET(Srv->ServerFd,&rfds);
    
    // Add the file
       FD_SET(Srv->ServerFd,&rfds);
    
    // Add the file


@@ -728,36 +765,29 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    // Add stdin
    FD_SET(STDIN_FILENO,&rfds);
          
    // Add stdin
    FD_SET(STDIN_FILENO,&rfds);
          

-   // Error Set
-   if (FileFD != -1)
-      FD_SET(FileFD,&efds);
-   if (Srv->ServerFd != -1)
-      FD_SET(Srv->ServerFd,&efds);
-

    // Figure out the max fd
    int MaxFd = FileFD;
    if (MaxFd < Srv->ServerFd)
       MaxFd = Srv->ServerFd;
    // Figure out the max fd
    int MaxFd = FileFD;
    if (MaxFd < Srv->ServerFd)
       MaxFd = Srv->ServerFd;

-   
+

    // Select
    struct timeval tv;
    tv.tv_sec = TimeOut;
    tv.tv_usec = 0;
    int Res = 0;
    // Select
    struct timeval tv;
    tv.tv_sec = TimeOut;
    tv.tv_usec = 0;
    int Res = 0;

-   if ((Res = select(MaxFd+1,&rfds,&wfds,&efds,&tv)) < 0)
-      return _error->Errno("select","Select failed");
+   if ((Res = select(MaxFd+1,&rfds,&wfds,0,&tv)) < 0)
+   {
+      if (errno == EINTR)
+        return true;
+      return _error->Errno("select",_("Select failed"));
+   }

    
    if (Res == 0)
    {
    
    if (Res == 0)
    {

-      _error->Error("Connection timed out");
+      _error->Error(_("Connection timed out"));

       return ServerDie(Srv);
    }
    
       return ServerDie(Srv);
    }
    

-   // Some kind of exception (error) on the sockets, die
-   if ((FileFD != -1 && FD_ISSET(FileFD,&efds)) || 
-       (Srv->ServerFd != -1 && FD_ISSET(Srv->ServerFd,&efds)))
-      return _error->Error("Socket Exception");
-

    // Handle server IO
    if (Srv->ServerFd != -1 && FD_ISSET(Srv->ServerFd,&rfds))
    {
    // Handle server IO
    if (Srv->ServerFd != -1 && FD_ISSET(Srv->ServerFd,&rfds))
    {


@@ -777,13 +807,13 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    if (FileFD != -1 && FD_ISSET(FileFD,&wfds))
    {
       if (Srv->In.Write(FileFD) == false)
    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
    if (FD_ISSET(STDIN_FILENO,&rfds))
    {
    }
 
    // Handle commands from APT
    if (FD_ISSET(STDIN_FILENO,&rfds))
    {

-      if (Run(true) != 0)
+      if (Run(true) != -1)

         exit(100);
    }   
        
         exit(100);
    }   
        


@@ -798,14 +828,17 @@ bool HttpMethod::Flush(ServerState *Srv)
 {
    if (File != 0)
    {
 {
    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)
       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;
       }
         if (Srv->In.IsLimit() == true)
            return true;
       }


@@ -826,11 +859,14 @@ bool HttpMethod::ServerDie(ServerState *Srv)
    // Dump the buffer to the file
    if (Srv->State == ServerState::Data)
    {
    // 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)
       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)
 
         // Done
         if (Srv->In.IsLimit() == true)


@@ -844,9 +880,9 @@ 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;
       errno = LErrno;

-      return _error->Errno("read","Error reading from server");
+      return _error->Errno("read",_("Error reading from server"));

    }
    else
    {
    }
    else
    {


@@ -872,7 +908,9 @@ bool HttpMethod::ServerDie(ServerState *Srv)
      1 - IMS hit
      3 - Unrecoverable error 
      4 - Error with error content page
      1 - IMS hit
      3 - Unrecoverable error 
      4 - Error with error content page

-     5 - Unrecoverable non-server error (close the connection) */
+     5 - Unrecoverable non-server error (close the connection) 
+     6 - Try again with a new or changed URI
+ */

 int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
 {
    // Not Modified
 int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
 {
    // Not Modified


@@ -884,6 +922,27 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       return 1;
    }
    
       return 1;
    }
    

+   /* Redirect
+    *
+    * Note that it is only OK for us to treat all redirection the same
+    * because we *always* use GET, not other HTTP methods.  There are
+    * three redirection codes for which it is not appropriate that we
+    * redirect.  Pass on those codes so the error handling kicks in.
+    */
+   if (AllowRedirect
+       && (Srv->Result > 300 && Srv->Result < 400)
+       && (Srv->Result != 300       // Multiple Choices
+           && Srv->Result != 304    // Not Modified
+           && Srv->Result != 306))  // (Not part of HTTP/1.1, reserved)
+   {
+      if (!Srv->Location.empty())
+      {
+         NextURI = Srv->Location;
+         return 6;
+      }
+      /* else pass through for error message */
+   }
+ 

    /* We have a reply we dont handle. This should indicate a perm server
       failure */
    if (Srv->Result < 200 || Srv->Result >= 300)
    /* We have a reply we dont handle. This should indicate a perm server
       failure */
    if (Srv->Result < 200 || Srv->Result >= 300)


@@ -913,22 +972,23 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
    if (Srv->StartPos >= 0)
    {
       Res.ResumePoint = Srv->StartPos;
    if (Srv->StartPos >= 0)
    {
       Res.ResumePoint = Srv->StartPos;

-      ftruncate(File->Fd(),Srv->StartPos);
+      if (ftruncate(File->Fd(),Srv->StartPos) < 0)
+        _error->Errno("ftruncate", _("Failed to truncate file"));

    }
       
    // Set the start point
    lseek(File->Fd(),0,SEEK_END);
 
    }
       
    // Set the start point
    lseek(File->Fd(),0,SEEK_END);
 

-   delete Srv->In.MD5;
-   Srv->In.MD5 = new MD5Summation;
+   delete Srv->In.Hash;
+   Srv->In.Hash = new Hashes;

    
    

-   // Fill the MD5 Hash if the file is non-empty (resume)
+   // Fill the Hash if the file is non-empty (resume)

    if (Srv->StartPos > 0)
    {
       lseek(File->Fd(),0,SEEK_SET);
    if (Srv->StartPos > 0)
    {
       lseek(File->Fd(),0,SEEK_SET);

-      if (Srv->In.MD5->AddFD(File->Fd(),Srv->StartPos) == false)
+      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);
         return 5;
       }
       lseek(File->Fd(),0,SEEK_END);


@@ -945,7 +1005,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
 void HttpMethod::SigTerm(int)
 {
    if (FailFd == -1)
 void HttpMethod::SigTerm(int)
 {
    if (FailFd == -1)

-      exit(100);
+      _exit(100);

    close(FailFd);
    
    // Timestamp
    close(FailFd);
    
    // Timestamp


@@ -954,7 +1014,7 @@ void HttpMethod::SigTerm(int)
    UBuf.modtime = FailTime;
    utime(FailFile.c_str(),&UBuf);
    
    UBuf.modtime = FailTime;
    utime(FailFile.c_str(),&UBuf);
    

-   exit(100);
+   _exit(100);

 }
                                                                        /*}}}*/
 // HttpMethod::Fetch - Fetch an item                                   /*{{{*/
 }
                                                                        /*}}}*/
 // HttpMethod::Fetch - Fetch an item                                   /*{{{*/


@@ -968,20 +1028,22 @@ bool HttpMethod::Fetch(FetchItem *)
 
    // Queue the requests
    int Depth = -1;
 
    // Queue the requests
    int Depth = -1;

-   bool Tail = false;
-   for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; I = I->Next, Depth++)
+   for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; 
+       I = I->Next, Depth++)

    {
    {

+      // If pipelining is disabled, we only queue 1 request
+      if (Server->Pipeline == false && Depth >= 0)
+        break;
+      

       // Make sure we stick with the same server
       if (Server->Comp(I->Uri) == false)
         break;
       if (QueueBack == I)
       // Make sure we stick with the same server
       if (Server->Comp(I->Uri) == false)
         break;
       if (QueueBack == I)

-        Tail = true;
-      if (Tail == true)

       {
         QueueBack = I->Next;
         SendReq(I,Server->Out);
         continue;
       {
         QueueBack = I->Next;
         SendReq(I,Server->Out);
         continue;

-      }         
+      }

    }
    
    return true;
    }
    
    return true;


@@ -995,9 +1057,11 @@ bool HttpMethod::Configuration(string Message)
    if (pkgAcqMethod::Configuration(Message) == false)
       return false;
    
    if (pkgAcqMethod::Configuration(Message) == false)
       return false;
    

+   AllowRedirect = _config->FindB("Acquire::http::AllowRedirect",true);

    TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);

+   Debug = _config->FindB("Debug::Acquire::http",false);

    
    return true;
 }
    
    return true;
 }


@@ -1007,6 +1071,10 @@ bool HttpMethod::Configuration(string Message)
 /* */
 int HttpMethod::Loop()
 {
 /* */
 int HttpMethod::Loop()
 {

+   typedef vector<string> StringVector;
+   typedef vector<string>::iterator StringVectorIterator;
+   map<string, StringVector> Redirected;
+

    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);
    
    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);
    


@@ -1022,8 +1090,10 @@ int HttpMethod::Loop()
            return 0;
       }
       
            return 0;
       }
       

-      // Run messages
-      if (Run(true) != 0)
+      /* Run messages, we can accept 0 (no message) if we didn't
+         do a WaitFd above.. Otherwise the FD is closed. */
+      int Result = Run(true);
+      if (Result != -1 && (Result != 0 || Queue == 0))

         return 100;
 
       if (Queue == 0)
         return 100;
 
       if (Queue == 0)


@@ -1035,7 +1105,14 @@ int HttpMethod::Loop()
         delete Server;
         Server = new ServerState(Queue->Uri,this);
       }
         delete Server;
         Server = new ServerState(Queue->Uri,this);
       }

-            
+      /* If the server has explicitly said this is the last connection
+         then we pre-emptively shut down the pipeline and tear down 
+        the connection. This will speed up HTTP/1.0 servers a tad
+        since we don't have to wait for the close sequence to
+         complete */
+      if (Server->Persistent == false)
+        Server->Close();
+      

       // Reset the pipeline
       if (Server->ServerFd == -1)
         QueueBack = Queue;      
       // Reset the pipeline
       if (Server->ServerFd == -1)
         QueueBack = Queue;      


@@ -1061,8 +1138,9 @@ 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);
            Fail(true);

+           RotateDNS();

            continue;
         }
         
            continue;
         }
         


@@ -1073,13 +1151,15 @@ int HttpMethod::Loop()
            FailCounter++;
            _error->Discard();
            Server->Close();
            FailCounter++;
            _error->Discard();
            Server->Close();

-
+           Server->Pipeline = false;
+           

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

-              Fail("Connection timed out",true);
+              Fail(_("Connection failed"),true);

               FailCounter = 0;
            }
            
               FailCounter = 0;
            }
            

+           RotateDNS();

            continue;
         }
       };
            continue;
         }
       };


@@ -1097,6 +1177,11 @@ int HttpMethod::Loop()
            // Run the data
            bool Result =  Server->RunData();
 
            // Run the data
            bool Result =  Server->RunData();
 

+           /* If the server is sending back sizeless responses then fill in
+              the size now */
+           if (Res.Size == 0)
+              Res.Size = File->Size();
+           

            // Close the file, destroy the FD object and timestamp it
            FailFd = -1;
            delete File;
            // Close the file, destroy the FD object and timestamp it
            FailFd = -1;
            delete File;


@@ -1112,12 +1197,28 @@ int HttpMethod::Loop()
            // Send status to APT
            if (Result == true)
            {
            // Send status to APT
            if (Result == true)
            {

-              Res.MD5Sum = Server->In.MD5->Result();
+              Res.TakeHashes(*Server->In.Hash);

               URIDone(Res);
            }
            else
               URIDone(Res);
            }
            else

-              Fail(true);
-
+           {
+              if (Server->ServerFd == -1)
+              {
+                 FailCounter++;
+                 _error->Discard();
+                 Server->Close();
+                 
+                 if (FailCounter >= 2)
+                 {
+                    Fail(_("Connection failed"),true);
+                    FailCounter = 0;
+                 }
+                 
+                 QueueBack = Queue;
+              }
+              else
+                 Fail(true);
+           }

            break;
         }
         
            break;
         }
         


@@ -1138,7 +1239,11 @@ int HttpMethod::Loop()
         // Hard internal error, kill the connection and fail
         case 5:
         {
         // Hard internal error, kill the connection and fail
         case 5:
         {

+           delete File;
+           File = 0;
+

            Fail();
            Fail();

+           RotateDNS();

            Server->Close();
            break;
         }
            Server->Close();
            break;
         }


@@ -1156,8 +1261,48 @@ int HttpMethod::Loop()
            break;
         }
         
            break;
         }
         

+         // Try again with a new URL
+         case 6:
+         {
+            // Clear rest of response if there is content
+            if (Server->HaveContent)
+            {
+               File = new FileFd("/dev/null",FileFd::WriteExists);
+               Server->RunData();
+               delete File;
+               File = 0;
+            }
+
+            /* Detect redirect loops.  No more redirects are allowed
+               after the same URI is seen twice in a queue item. */
+            StringVector &R = Redirected[Queue->DestFile];
+            bool StopRedirects = false;
+            if (R.size() == 0)
+               R.push_back(Queue->Uri);
+            else if (R[0] == "STOP" || R.size() > 10)
+               StopRedirects = true;
+            else
+            {
+               for (StringVectorIterator I = R.begin(); I != R.end(); I++)
+                  if (Queue->Uri == *I)
+                  {
+                     R[0] = "STOP";
+                     break;
+                  }
+ 
+               R.push_back(Queue->Uri);
+            }
+ 
+            if (StopRedirects == false)
+               Redirect(NextURI);
+            else
+               Fail();
+ 
+            break;
+         }
+

         default:
         default:

-        Fail("Internal error");
+        Fail(_("Internal error"));

         break;
       }
       
         break;
       }
       


@@ -1170,7 +1315,13 @@ int HttpMethod::Loop()
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+   // ignore SIGPIPE, this can happen on write() if the socket
+   // closes the connection (this is dealt with via ServerDie())
+   signal(SIGPIPE, SIG_IGN);
+

    HttpMethod Mth;
    HttpMethod Mth;

-   

    return Mth.Loop();
 }
    return Mth.Loop();
 }

+
+