merged from the mvo branch

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index dec5cd80f3105788d01512bcda625ada112a8736..bac94e177d2822b4455e8f4361d84e6e219acbfd 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -99,6 +99,7 @@ struct ServerState
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;

+   string Location;

    
    // This is a Persistent attribute of the server itself.
    bool Pipeline;
    
    // This is a Persistent attribute of the server itself.
    bool Pipeline;


@@ -133,6 +134,7 @@ class HttpMethod : public pkgAcqMethod
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);
    int DealWithHeaders(FetchResult &Res,ServerState *Srv);
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);
    int DealWithHeaders(FetchResult &Res,ServerState *Srv);

+   bool AutoDetectProxy();

 
    virtual bool Configuration(string Message);
    
 
    virtual bool Configuration(string Message);
    


@@ -145,6 +147,9 @@ class HttpMethod : public pkgAcqMethod
    protected:
    virtual bool Fetch(FetchItem *);
    
    protected:
    virtual bool Fetch(FetchItem *);
    

+   string NextURI;
+   string AutoDetectProxyCmd;
+   

    public:
    friend class ServerState;
 
    public:
    friend class ServerState;