send Alt-* info for uncompressed based on any compressions

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 2335559fb0e4073020e2ddd53f60b8b57553b0d0..4cc48fc34b7ecdc595e4fd9da1b5c3f560019e04 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -52,28 +52,34 @@ class HttpsServerState : public ServerState
    virtual ~HttpsServerState() {Close();};
 };
 
    virtual ~HttpsServerState() {Close();};
 };
 

-class HttpsMethod : public pkgAcqMethod
+class HttpsMethod : public ServerMethod

 {
    // minimum speed in bytes/se that triggers download timeout handling
    static const int DL_MIN_SPEED = 10;
 
    virtual bool Fetch(FetchItem *);
 {
    // minimum speed in bytes/se that triggers download timeout handling
    static const int DL_MIN_SPEED = 10;
 
    virtual bool Fetch(FetchItem *);

+

    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 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;
    void SetupProxy();
    CURL *curl;

-   FetchResult Res;
-   HttpsServerState *Server;
-   unsigned long long TotalWritten;
+   ServerState *Server;
+
+   // Used by ServerMethods unused by https
+   virtual void SendReq(FetchItem *) { exit(42); }
+   virtual void RotateDNS() { exit(42); }

 
    public:
    FileFd *File;
 
    public:
    FileFd *File;

-      
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), TotalWritten(0), File(NULL)
+
+   virtual bool Configuration(std::string Message);
+   virtual ServerState * CreateServerState(URI uri);
+   using pkgAcqMethod::FetchResult;
+
+   HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)

    {
    {

-      File = 0;

       curl = curl_easy_init();
    };
 
       curl = curl_easy_init();
    };