respect user pinning in M-A:same version (un)screwing

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 0147f96a0bb90e9c9ea1efaeb775de9de0e2a741..4d50c5a040cdd1f62508c781876333f71f009446 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -68,21 +68,19 @@ class HttpsMethod : public ServerMethod
                                 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
                                 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;

-   std::unique_ptr<ServerState> Server;

 
    // Used by ServerMethods unused by https
    virtual void SendReq(FetchItem *) APT_OVERRIDE { exit(42); }
    virtual void RotateDNS() APT_OVERRIDE { exit(42); }
 
    public:
 
    // 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 std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
    using pkgAcqMethod::FetchResult;
    using pkgAcqMethod::FetchItem;
 
 
    virtual bool Configuration(std::string Message) APT_OVERRIDE;
    virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
    using pkgAcqMethod::FetchResult;
    using pkgAcqMethod::FetchItem;
 

-   HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig), File(NULL)
+   HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig)

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