methods/http.cc: remove merge artifact

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index 5eac1140105796546a5031fcb37fe9f2c7123337..bc076e1f8ae1996dc00d86ffb8302deebd6db60a 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.
 
    ##################################################################### */
                                                                        /*}}}*/
@@ -99,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;
@@ -145,6 +146,8 @@ class HttpMethod : public pkgAcqMethod
    protected:
    virtual bool Fetch(FetchItem *);
    
+   string NextURI;
+   
    public:
    friend class ServerState;
 
@@ -160,5 +163,4 @@ class HttpMethod : public pkgAcqMethod
    };
 };
 
-
 #endif