Fixed dumpavail bug with dup packageS

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 5fbec8de2cad7c0091f073532126e593d32bc9f8..b5d26d127754867fefbc5f5926127cb778b5990e 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: http.cc,v 1.14 1998/12/11 01:07:31 jgg Exp $
+// $Id: http.cc,v 1.26 1999/02/15 00:26:55 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
+#include <errno.h>
 
 // Internet stuff
 #include <netinet/in.h>
@@ -346,7 +347,7 @@ bool ServerState::Open()
       return _error->Errno("select","Select failed");
    if (Res == 0)
       return _error->Error("Could not connect, connection timed out");
-   unsigned int Err,Len;
+   unsigned int Err,Len=sizeof(Err);
    if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
       return _error->Errno("getsockopt","Failed");
    if (Err != 0)
@@ -447,7 +448,7 @@ bool ServerState::RunData()
            while ((Last = Owner->Go(false,this)) == true);
            if (Last == false)
               return false;
-           return true;
+           return !_error->PendingError();
         }
         
         // Transfer the block
@@ -489,12 +490,12 @@ bool ServerState::RunData()
            continue;
         
         In.Limit(-1);
-        return true;
+        return !_error->PendingError();
       }
       while (Owner->Go(true,this) == true);
    }
 
-   return Owner->Flush(this);
+   return Owner->Flush(this) && !_error->PendingError();
 }
                                                                        /*}}}*/
 // ServerState::HeaderLine - Process a header line                     /*{{{*/
@@ -504,7 +505,7 @@ bool ServerState::HeaderLine(string Line)
 {
    if (Line.empty() == true)
       return true;
-   
+
    // 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);
@@ -616,7 +617,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       and we expect the proxy to do this */
    if (Proxy.empty() == true)
       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
-             Uri.Path.c_str(),ProperHost.c_str());
+             QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
    else
    {
       /* Generate a cache control header if necessary. We place a max
@@ -625,7 +626,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       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\n");
+        strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
       else
       {
         if (Itm->IndexFile == true)
@@ -659,8 +660,9 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       }
    }
 
-/*   if (ProxyAuth.empty() == false)
-      Req += string("Proxy-Authorization: Basic ") + Base64Encode(ProxyAuth) + "\r\n";*/
+   if (Proxy.User.empty() == false || Proxy.Password.empty() == false)
+      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;
@@ -874,6 +876,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
       return 5;
 
    FailFile = Queue->DestFile;
+   FailFile.c_str();   // Make sure we don't do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Srv->Date;
       
@@ -964,8 +967,9 @@ bool HttpMethod::Configuration(string Message)
    if (pkgAcqMethod::Configuration(Message) == false)
       return false;
    
-   TimeOut = _config->FindI("Acquire::http::Timeout",120);
-   PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",5);
+   TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut);
+   PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
+                                 PipelineDepth);
    
    return true;
 }
@@ -985,7 +989,7 @@ int HttpMethod::Loop()
    {
       if (FailCounter >= 2)
       {
-        Fail("Massive Server Brain Damage");
+        Fail("Massive Server Brain Damage",true);
         FailCounter = 0;
       }
       
@@ -1010,10 +1014,16 @@ int HttpMethod::Loop()
         Server = new ServerState(Queue->Uri,this);
       }
             
+      // Reset the pipeline
+      if (Server->ServerFd == -1)
+        QueueBack = Queue;      
+        
       // Connnect to the host
       if (Server->Open() == false)
       {
-        Fail();
+        Fail(true);
+        delete Server;
+        Server = 0;
         continue;
       }
 
@@ -1030,7 +1040,7 @@ int HttpMethod::Loop()
         case 2:
         {
            _error->Error("Bad header Data");
-           Fail();
+           Fail(true);
            continue;
         }