Fixed could not connect problem

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index cd0b913c3ea9f8b7fa873971e432f3b44bf70c58..ceb2cea145ab47a358cd594d0d411fb4355fffb1 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: http.cc,v 1.17 1998/12/14 08:23:10 jgg Exp $
+// $Id: http.cc,v 1.23 1999/01/28 06:32:31 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -346,7 +346,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)
@@ -616,7 +616,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
@@ -659,8 +659,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 +875,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;
       
@@ -1019,6 +1021,8 @@ int HttpMethod::Loop()
       if (Server->Open() == false)
       {
         Fail();
+        delete Server;
+        Server = 0;
         continue;
       }