po/{ca,cs,ru}.po: fix merge artifacts harder

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 6620a10fc5d9b7a93c163152a5b666059fbb4b8f..293e288e06f8d6fe1872bbcf4769ff4d2fc48ae5 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -3,15 +3,13 @@
 // $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.
 
    ##################################################################### */
                                                                        /*}}}*/
 
-#ifndef APT_HTTP_H
-#define APT_HTTP_H
-
-#define MAXLEN 360
+#ifndef APT_HTTPS_H
+#define APT_HTTPS_H
 
 #include <iostream>
 #include <curl/curl.h>
@@ -20,16 +18,18 @@ using std::cout;
 using std::endl;
 
 class HttpsMethod;
-
+class FileFd;
 
 class HttpsMethod : public pkgAcqMethod
 {
+   // minimum speed in bytes/se that triggers download timeout handling
+   static const int DL_MIN_SPEED = 10;
 
    virtual bool Fetch(FetchItem *);
    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);
-   bool SetupProxy();
+   void SetupProxy();
    CURL *curl;
    FetchResult Res;
 
@@ -41,8 +41,14 @@ class HttpsMethod : public pkgAcqMethod
       File = 0;
       curl = curl_easy_init();
    };
+
+   ~HttpsMethod()
+   {
+      curl_easy_cleanup(curl);
+   };
 };
 
+#include <apt-pkg/strutl.h>
 URI Proxy;
 
 #endif