* apt-pkg/acquire-item.cc:

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 1833f41efdbaf692213e9a926719ab20d1f43832..ecfb80bd2e3a451d3264b061e4c1fdf86f32e775 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -38,12 +38,12 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

-#include <iostream>

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

+#include "config.h"

 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"


@@ -57,7 +57,7 @@ time_t HttpMethod::FailTime = 0;
 unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;
 bool Debug = false;
 unsigned long PipelineDepth = 10;
 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;


@@ -714,7 +714,7 @@ 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: Ubuntu APT-HTTP/1.3\r\n\r\n";
+   Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n";

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


@@ -915,6 +915,9 @@ 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)
         return 4;
       _error->Error("%u %s",Srv->Result,Srv->Code);
       if (Srv->HaveContent == true)
         return 4;


@@ -990,7 +993,7 @@ void HttpMethod::SigTerm(int)
    depth. */
 bool HttpMethod::Fetch(FetchItem *)
 {
    depth. */
 bool HttpMethod::Fetch(FetchItem *)
 {

-   if (Server == 0)
+   if (Server == 0) 

       return true;
 
    // Queue the requests
       return true;
 
    // Queue the requests


@@ -1223,13 +1226,5 @@ int HttpMethod::Loop()
 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-int main()
-{
-   setlocale(LC_ALL, "");
-
-   HttpMethod Mth;
-   
-   return Mth.Loop();
-}