test framework: Unset http proxy variables in setupenvironment

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 29b20b9215dd9b7de5c9894bb27624a460281fcb..4d50c5a040cdd1f62508c781876333f71f009446 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <stddef.h>
 #include <string>
 #include <iostream>
 #include <stddef.h>
 #include <string>

+#include <memory>

 
 #include "server.h"
 
 
 #include "server.h"
 


@@ -67,21 +68,19 @@ class HttpsMethod : public ServerMethod
                                 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
                                 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:
 
    // 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 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;
 
    using pkgAcqMethod::FetchResult;
    using pkgAcqMethod::FetchItem;
 

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

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