* cmdline/apt-key:

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index c5a4d0e86a1f9967ed2f573eb9bb508b95646dd4..ceee36cbeb9814ae3380a4637f912e334d1e4921 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -3,7 +3,7 @@
 // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
 /* ######################################################################
 
-   HTTP Aquire Method - This is the HTTP aquire method for APT.
+   HTTP Acquire Method - This is the HTTP aquire method for APT.
 
    ##################################################################### */
                                                                        /*}}}*/
@@ -31,6 +31,11 @@ class CircleBuf
    unsigned long MaxGet;
    struct timeval Start;
    
+   static unsigned long BwReadLimit;
+   static unsigned long BwTickReadData;
+   static struct timeval BwReadTick;
+   static const unsigned int BW_HZ;
+
    unsigned long LeftRead()
    {
       unsigned long Sz = Size - (InP - OutP);
@@ -94,6 +99,7 @@ struct ServerState
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
+   string Location;
    
    // This is a Persistent attribute of the server itself.
    bool Pipeline;
@@ -128,6 +134,7 @@ class HttpMethod : public pkgAcqMethod
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);
    int DealWithHeaders(FetchResult &Res,ServerState *Srv);
+   bool AutoDetectProxy();
 
    virtual bool Fetch(FetchItem *);
    virtual bool Configuration(string Message);
@@ -138,6 +145,9 @@ class HttpMethod : public pkgAcqMethod
    static time_t FailTime;
    static void SigTerm(int);
    
+   string NextURI;
+   string AutoDetectProxyCmd;
+   
    public:
    friend class ServerState;
 
@@ -153,6 +163,4 @@ class HttpMethod : public pkgAcqMethod
    };
 };
 
-URI Proxy;
-
 #endif