if reading of autobit state failed, let write fail

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 29b20b9215dd9b7de5c9894bb27624a460281fcb..74b86a24f8016c72ce4e00b87cff8003b3e62b2a 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,12 +11,11 @@
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 
-#include <apt-pkg/acquire-method.h>
-
 #include <curl/curl.h>
 #include <iostream>
 #include <stddef.h>
 #include <string>
+#include <memory>
 
 #include "server.h"
 
@@ -67,22 +66,21 @@ class HttpsMethod : public ServerMethod
                                 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
-   ServerState *Server;
 
    // Used by ServerMethods unused by https
    virtual void SendReq(FetchItem *) APT_OVERRIDE { exit(42); }
    virtual void RotateDNS() APT_OVERRIDE { exit(42); }
 
    public:
-   FileFd *File;
 
    virtual bool Configuration(std::string Message) APT_OVERRIDE;
-   virtual ServerState * CreateServerState(URI uri) APT_OVERRIDE;
+   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
    using pkgAcqMethod::FetchResult;
    using pkgAcqMethod::FetchItem;
 
-   HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)
+   HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig)
    {
+      curl_global_init(CURL_GLOBAL_SSL);
       curl = curl_easy_init();
    };