* apt-pkg/pkgcachegen.cc:

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 4b9622b00c1de73919f8cbbc3719b9873ce6e339..d4e231fbe59ba618a81c3c5521c264a346f58f8c 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
 // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz 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
    pipelining, range, if-range and so on. 
    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    pipelining, range, if-range and so on. 


@@ -55,9 +55,10 @@ using namespace std;
 string HttpMethod::FailFile;
 int HttpMethod::FailFd = -1;
 time_t HttpMethod::FailTime = 0;
 string HttpMethod::FailFile;
 int HttpMethod::FailFd = -1;
 time_t HttpMethod::FailTime = 0;

-unsigned long PipelineDepth = 8;
+unsigned long PipelineDepth = 10;

 unsigned long TimeOut = 120;
 bool Debug = false;
 unsigned long TimeOut = 120;
 bool Debug = false;

+URI Proxy;

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


@@ -995,7 +996,6 @@ 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++)
    {


@@ -1007,8 +1007,6 @@ bool HttpMethod::Fetch(FetchItem *)
       if (Server->Comp(I->Uri) == false)
         break;
       if (QueueBack == I)
       if (Server->Comp(I->Uri) == false)
         break;
       if (QueueBack == I)

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

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


@@ -1070,7 +1068,6 @@ 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
       /* 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


@@ -1167,8 +1164,24 @@ int HttpMethod::Loop()
               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;
         }