methods/http.cc: remove merge artifact

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index 13f02ec77b0b0c3d7560128ed07bd7c938c2ff50..bc076e1f8ae1996dc00d86ffb8302deebd6db60a 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -13,7 +13,7 @@
 
 #define MAXLEN 360
 
-#include <iostream>
+
 
 using std::cout;
 using std::endl;
@@ -135,7 +135,6 @@ class HttpMethod : public pkgAcqMethod
    bool ServerDie(ServerState *Srv);
    int DealWithHeaders(FetchResult &Res,ServerState *Srv);
 
-   virtual bool Fetch(FetchItem *);
    virtual bool Configuration(string Message);
    
    // In the event of a fatal signal this file will be closed and timestamped.
@@ -143,6 +142,9 @@ class HttpMethod : public pkgAcqMethod
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
+
+   protected:
+   virtual bool Fetch(FetchItem *);
    
    string NextURI;