* methods/http{s,}.cc:

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 3b210f6b612153fd5a433e784956b28c22ce6677..2721b1224e69afd8025aff8b514e4d110c9abc43 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -25,8 +25,11 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>

+#include <apt-pkg/configuration.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>


@@ -41,8 +44,6 @@
 #include <string.h>
 #include <iostream>
 #include <map>
 #include <string.h>
 #include <iostream>
 #include <map>

-#include <apti18n.h>
-

 
 // Internet stuff
 #include <netdb.h>
 
 // Internet stuff
 #include <netdb.h>


@@ -51,6 +52,8 @@
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"

+
+#include <apti18n.h>

                                                                        /*}}}*/
 using namespace std;
 
                                                                        /*}}}*/
 using namespace std;
 


@@ -63,15 +66,15 @@ bool AllowRedirect = false;
 bool Debug = false;
 URI Proxy;
 
 bool Debug = false;
 URI Proxy;
 

-unsigned long CircleBuf::BwReadLimit=0;
-unsigned long CircleBuf::BwTickReadData=0;
+unsigned long long CircleBuf::BwReadLimit=0;
+unsigned long long CircleBuf::BwTickReadData=0;

 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
 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), Hash(0)
+CircleBuf::CircleBuf(unsigned long long Size) : Size(Size), Hash(0)

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


@@ -87,7 +90,7 @@ void CircleBuf::Reset()
    InP = 0;
    OutP = 0;
    StrPos = 0;
    InP = 0;
    OutP = 0;
    StrPos = 0;

-   MaxGet = (unsigned int)-1;
+   MaxGet = (unsigned long long)-1;

    OutQueue = string();
    if (Hash != 0)
    {
    OutQueue = string();
    if (Hash != 0)
    {


@@ -102,7 +105,7 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

-   unsigned long BwReadMax;
+   unsigned long long BwReadMax;

 
    while (1)
    {
 
    while (1)
    {


@@ -117,7 +120,7 @@ bool CircleBuf::Read(int Fd)
         struct timeval now;
         gettimeofday(&now,0);
 
         struct timeval now;
         gettimeofday(&now,0);
 

-        unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+        unsigned long 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;
            now.tv_usec-CircleBuf::BwReadTick.tv_usec;
         if(d > 1000000/BW_HZ) {
            CircleBuf::BwReadTick = now;


@@ -131,7 +134,7 @@ bool CircleBuf::Read(int Fd)
       }
 
       // Write the buffer segment
       }
 
       // Write the buffer segment

-      int Res;
+      ssize_t Res;

       if(CircleBuf::BwReadLimit) {
         Res = read(Fd,Buf + (InP%Size), 
                    BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
       if(CircleBuf::BwReadLimit) {
         Res = read(Fd,Buf + (InP%Size), 
                    BwReadMax > LeftRead() ? LeftRead() : BwReadMax);


@@ -180,7 +183,7 @@ void CircleBuf::FillOut()
         return;
       
       // Write the buffer segment
         return;
       
       // Write the buffer segment

-      unsigned long Sz = LeftRead();
+      unsigned long long Sz = LeftRead();

       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;
       memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);
       if (OutQueue.length() - StrPos < Sz)
         Sz = OutQueue.length() - StrPos;
       memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);


@@ -214,7 +217,7 @@ bool CircleBuf::Write(int Fd)
         return true;
       
       // Write the buffer segment
         return true;
       
       // Write the buffer segment

-      int Res;
+      ssize_t Res;

       Res = write(Fd,Buf + (OutP%Size),LeftWrite());
 
       if (Res == 0)
       Res = write(Fd,Buf + (OutP%Size),LeftWrite());
 
       if (Res == 0)


@@ -240,7 +243,7 @@ bool CircleBuf::Write(int Fd)
 bool CircleBuf::WriteTillEl(string &Data,bool Single)
 {
    // We cheat and assume it is unneeded to have more than one buffer load
 bool CircleBuf::WriteTillEl(string &Data,bool Single)
 {
    // We cheat and assume it is unneeded to have more than one buffer load

-   for (unsigned long I = OutP; I < InP; I++)
+   for (unsigned long long I = OutP; I < InP; I++)

    {      
       if (Buf[I%Size] != '\n')
         continue;
    {      
       if (Buf[I%Size] != '\n')
         continue;


@@ -258,7 +261,7 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       Data = "";
       while (OutP < I)
       {
       Data = "";
       while (OutP < I)
       {

-        unsigned long Sz = LeftWrite();
+        unsigned long long Sz = LeftWrite();

         if (Sz == 0)
            return false;
         if (I - OutP < Sz)
         if (Sz == 0)
            return false;
         if (I - OutP < Sz)


@@ -286,6 +289,11 @@ void CircleBuf::Stats()
    clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
 }
                                                                        /*}}}*/
    clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
 }
                                                                        /*}}}*/

+CircleBuf::~CircleBuf()
+{
+   delete [] Buf;
+   delete Hash;
+}

 
 // ServerState::ServerState - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 
 // ServerState::ServerState - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------


@@ -378,7 +386,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;
    


@@ -402,12 +410,12 @@ int ServerState::RunHeaders()
       if (Debug == true)
         clog << Data;
       
       if (Debug == true)
         clog << Data;
       

-      for (string::const_iterator I = Data.begin(); I < Data.end(); I++)
+      for (string::const_iterator I = Data.begin(); I < Data.end(); ++I)

       {
         string::const_iterator J = I;
       {
         string::const_iterator J = I;

-        for (; J != Data.end() && *J != '\n' && *J != '\r';J++);
+        for (; J != Data.end() && *J != '\n' && *J != '\r'; ++J);

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

-           return 2;
+           return RUN_HEADERS_PARSE_ERROR;

         I = J;
       }
 
         I = J;
       }
 


@@ -419,11 +427,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            /*{{{*/


@@ -453,7 +461,7 @@ bool ServerState::RunData()
            return false;
                 
         // See if we are done
            return false;
                 
         // See if we are done

-        unsigned long Len = strtol(Data.c_str(),0,16);
+        unsigned long long Len = strtoull(Data.c_str(),0,16);

         if (Len == 0)
         {
            In.Limit(-1);
         if (Len == 0)
         {
            In.Limit(-1);


@@ -553,8 +561,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


@@ -590,7 +604,7 @@ bool ServerState::HeaderLine(string Line)
       if (StartPos != 0)
         return true;
       
       if (StartPos != 0)
         return true;
       

-      if (sscanf(Val.c_str(),"%lu",&Size) != 1)
+      if (sscanf(Val.c_str(),"%llu",&Size) != 1)

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


@@ -605,9 +619,9 @@ bool ServerState::HeaderLine(string Line)
    {
       HaveContent = true;
       
    {
       HaveContent = true;
       

-      if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
+      if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&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 long long)StartPos > Size)

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


@@ -631,7 +645,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;
    }


@@ -682,25 +696,39 @@ 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());

-      // only generate a cache control header if we actually want to 
-      // use a cache
-      if (_config->FindB("Acquire::http::No-Cache",false) == false)
+   }
+   // generate a cache control header (if needed)
+   if (_config->FindB("Acquire::http::No-Cache",false) == true) 
+   {
+      strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
+   }
+   else
+   {
+      if (Itm->IndexFile == true) 

       {
       {

-        if (Itm->IndexFile == true)
-           sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
-                   _config->FindI("Acquire::http::Max-Age",0));
-        else
-        {
-           if (_config->FindB("Acquire::http::No-Store",false) == true)
-              strcat(Buf,"Cache-Control: no-store\r\n");
-        }       
+        sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
+                _config->FindI("Acquire::http::Max-Age",0));
+      }
+      else
+      {
+        if (_config->FindB("Acquire::http::No-Store",false) == true)
+           strcat(Buf,"Cache-Control: no-store\r\n");

       }
    }
       }
    }

-   // 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");

 
 

-   
+   // If we ask for uncompressed files servers might respond with content-
+   // negotation which lets us end up with compressed files we do not support,
+   // see 657029, 657560 and co, so if we have no extension on the request
+   // ask for text only. As a sidenote: If there is nothing to negotate servers
+   // seem to be nice and ignore it.
+   if (_config->FindB("Acquire::http::SendAccept", true) == true)
+   {
+      size_t const filepos = Itm->Uri.find_last_of('/');
+      string const file = Itm->Uri.substr(filepos + 1);
+      if (flExtension(file) == file)
+        strcat(Buf,"Accept: text/*\r\n");
+   }
+

    string Req = Buf;
 
    // Check for a partial file
    string Req = Buf;
 
    // Check for a partial file


@@ -708,7 +736,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",(long)SBuf.st_size - 1,
+      sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size - 1,

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


@@ -731,7 +759,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }

-   Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
+   Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
+               "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";

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


@@ -769,9 +798,10 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    
    if (Srv->In.WriteSpace() == true && ToFile == true && FileFD != -1)
       FD_SET(FileFD,&wfds);
    
    if (Srv->In.WriteSpace() == true && ToFile == true && FileFD != -1)
       FD_SET(FileFD,&wfds);

-   
+

    // Add stdin
    // Add stdin

-   FD_SET(STDIN_FILENO,&rfds);
+   if (_config->FindB("Acquire::http::DependOnSTDIN", true) == true)
+      FD_SET(STDIN_FILENO,&rfds);

          
    // Figure out the max fd
    int MaxFd = FileFD;
          
    // Figure out the max fd
    int MaxFd = FileFD;


@@ -911,15 +941,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)


@@ -927,7 +952,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


@@ -943,10 +968,26 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
            && Srv->Result != 304    // Not Modified
            && Srv->Result != 306))  // (Not part of HTTP/1.1, reserved)
    {
            && Srv->Result != 304    // Not Modified
            && Srv->Result != 306))  // (Not part of HTTP/1.1, reserved)
    {

-      if (!Srv->Location.empty())
+      if (Srv->Location.empty() == true);
+      else if (Srv->Location[0] == '/' && Queue->Uri.empty() == false)
+      {
+        URI Uri = Queue->Uri;
+        if (Uri.Host.empty() == false)
+        {
+           if (Uri.Port != 0)
+              strprintf(NextURI, "http://%s:%u", Uri.Host.c_str(), Uri.Port);
+           else
+              NextURI = "http://" + Uri.Host;
+        }
+        else
+           NextURI.clear();
+        NextURI.append(DeQuoteString(Srv->Location));
+        return TRY_AGAIN_OR_REDIRECT;
+      }
+      else

       {
       {

-         NextURI = Srv->Location;
-         return 6;
+         NextURI = DeQuoteString(Srv->Location);
+         return TRY_AGAIN_OR_REDIRECT;

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


@@ -955,10 +996,13 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       failure */
    if (Srv->Result < 200 || Srv->Result >= 300)
    {
       failure */
    if (Srv->Result < 200 || Srv->Result >= 300)
    {

+      char err[255];
+      snprintf(err,sizeof(err)-1,"HttpError%i",Srv->Result);
+      SetFailReason(err);

       _error->Error("%u %s",Srv->Result,Srv->Code);
       if (Srv->HaveContent == true)
       _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


@@ -969,41 +1013,31 @@ 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
    FailFd = File->Fd();
    FailTime = Srv->Date;
 
    FailFile = Queue->DestFile;
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Srv->Date;

-      
-   // Set the expected size
-   if (Srv->StartPos >= 0)
-   {
-      Res.ResumePoint = 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);

 
    delete Srv->In.Hash;
    Srv->In.Hash = new Hashes;
 
    delete Srv->In.Hash;
    Srv->In.Hash = new Hashes;

-   
-   // Fill the Hash if the file is non-empty (resume)
-   if (Srv->StartPos > 0)
+
+   // Set the expected size and read file for the hashes
+   if (Srv->StartPos >= 0)

    {
    {

-      lseek(File->Fd(),0,SEEK_SET);
-      if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
+      Res.ResumePoint = Srv->StartPos;
+      File->Truncate(Srv->StartPos);
+
+      if (Srv->In.Hash->AddFD(*File,Srv->StartPos) == false)

       {
         _error->Errno("read",_("Problem hashing file"));
       {
         _error->Errno("read",_("Problem hashing file"));

-        return 5;
+        return ERROR_NOT_FROM_SERVER;

       }
       }

-      lseek(File->Fd(),0,SEEK_END);

    }
    
    SetNonBlock(File->Fd(),true);
    }
    
    SetNonBlock(File->Fd(),true);

-   return 0;
+   return FILE_IS_OPEN;

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


@@ -1070,7 +1104,11 @@ bool HttpMethod::Configuration(string Message)
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);

-   
+   AutoDetectProxyCmd = _config->Find("Acquire::http::ProxyAutoDetect");
+
+   // Get the proxy to use
+   AutoDetectProxy();
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1102,7 +1140,13 @@ int HttpMethod::Loop()
          do a WaitFd above.. Otherwise the FD is closed. */
       int Result = Run(true);
       if (Result != -1 && (Result != 0 || Queue == 0))
          do a WaitFd above.. Otherwise the FD is closed. */
       int Result = Run(true);
       if (Result != -1 && (Result != 0 || Queue == 0))

-        return 100;
+      {
+        if(FailReason.empty() == false ||
+           _config->FindB("Acquire::http::DependOnSTDIN", true) == true)
+           return 100;
+        else
+           return 0;
+      }

 
       if (Queue == 0)
         continue;
 
       if (Queue == 0)
         continue;


@@ -1140,11 +1184,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);


@@ -1154,7 +1198,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();


@@ -1178,7 +1222,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);
 


@@ -1231,21 +1275,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;


@@ -1257,7 +1301,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();
            


@@ -1270,7 +1314,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)


@@ -1291,7 +1335,7 @@ int HttpMethod::Loop()
                StopRedirects = true;
             else
             {
                StopRedirects = true;
             else
             {

-               for (StringVectorIterator I = R.begin(); I != R.end(); I++)
+               for (StringVectorIterator I = R.begin(); I != R.end(); ++I)

                   if (Queue->Uri == *I)
                   {
                      R[0] = "STOP";
                   if (Queue->Uri == *I)
                   {
                      R[0] = "STOP";


@@ -1320,16 +1364,57 @@ int HttpMethod::Loop()
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

-
-int main()
+// HttpMethod::AutoDetectProxy - auto detect proxy                     /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool HttpMethod::AutoDetectProxy()

 {
 {

-   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);
+   if (AutoDetectProxyCmd.empty())
+      return true;

 
 

-   HttpMethod Mth;
-   return Mth.Loop();
+   if (Debug)
+      clog << "Using auto proxy detect command: " << AutoDetectProxyCmd << endl;
+
+   int Pipes[2] = {-1,-1};
+   if (pipe(Pipes) != 0)
+      return _error->Errno("pipe", "Failed to create Pipe");
+
+   pid_t Process = ExecFork();
+   if (Process == 0)
+   {
+      close(Pipes[0]);
+      dup2(Pipes[1],STDOUT_FILENO);
+      SetCloseExec(STDOUT_FILENO,false);
+
+      const char *Args[2];
+      Args[0] = AutoDetectProxyCmd.c_str();
+      Args[1] = 0;
+      execv(Args[0],(char **)Args);
+      cerr << "Failed to exec method " << Args[0] << endl;
+      _exit(100);
+   }
+   char buf[512];
+   int InFd = Pipes[0];
+   close(Pipes[1]);
+   int res = read(InFd, buf, sizeof(buf));
+   ExecWait(Process, "ProxyAutoDetect", true);
+
+   if (res < 0)
+      return _error->Errno("read", "Failed to read");
+   if (res == 0)
+      return _error->Warning("ProxyAutoDetect returned no data");
+
+   // add trailing \0
+   buf[res] = 0;
+
+   if (Debug)
+      clog << "auto detect command returned: '" << buf << "'" << endl;
+
+   if (strstr(buf, "http://") == buf)
+      _config->Set("Acquire::http::proxy", _strstrip(buf));
+
+   return true;

 }
 }

+                                                                       /*}}}*/