merge debian/sid into debian/experimental

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 411b71440119146e78166f94566437b510cb739f..6917a6ff68981d311168ec85ae45ed1f9935b2bb 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -50,6 +50,8 @@ class HttpsServerState : public ServerState
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};
+
+   bool ReceivedData;
 };
 
 class HttpsMethod : public pkgAcqMethod
@@ -58,22 +60,22 @@ class HttpsMethod : public pkgAcqMethod
    static const int DL_MIN_SPEED = 10;
 
    virtual bool Fetch(FetchItem *);
+   virtual bool Configuration(std::string Message);
+
    static size_t parse_header(void *buffer, size_t size, size_t nmemb, void *userp);
    static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
-   static int progress_callback(void *clientp, double dltotal, double dlnow, 
-                               double ultotal, double ulnow);
+   static int progress_callback(void *clientp, double dltotal, double dlnow,
+                                double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
    FetchResult Res;
    HttpsServerState *Server;
-   bool ReceivedData;
 
    public:
    FileFd *File;
-      
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), File(NULL)
+
+   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), File(NULL)
    {
-      File = 0;
       curl = curl_easy_init();
    };