* merged from apt--mvo

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index c6623c46f09cf97fcb67b1123f49df29e5b979db..5aefd4c1f120047f9ab8ddfac04e0d1fc9f7d330 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -44,6 +44,7 @@
 // Internet stuff
 #include <netdb.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"


@@ -58,7 +59,6 @@ unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;
 bool Debug = false;
 
 unsigned long TimeOut = 120;
 bool Debug = false;
 

-

 unsigned long CircleBuf::BwReadLimit=0;
 unsigned long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 unsigned long CircleBuf::BwReadLimit=0;
 unsigned long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,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: Debian APT-HTTP/1.3\r\n\r\n";
+   Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";

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