show distribution mismatch for changed codenames

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index e6b11d642d79171dd1774fb05420c2e2a42ed074..b7341f5f8671c0f817a4a9db05b12ce949bc4be9 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -67,7 +67,7 @@ class CircleBuf
 
    // Read data in
    bool Read(int Fd);
 
    // Read data in
    bool Read(int Fd);

-   bool Read(std::string Data);
+   bool Read(std::string const &Data);

 
    // Write data out
    bool Write(int Fd);
 
    // Write data out
    bool Write(int Fd);


@@ -86,7 +86,7 @@ class CircleBuf
    // Dump everything
    void Stats();
 
    // Dump everything
    void Stats();
 

-   explicit CircleBuf(unsigned long long Size);
+   CircleBuf(HttpMethod const * const Owner, unsigned long long Size);

    ~CircleBuf();
 };
 
    ~CircleBuf();
 };
 


@@ -103,7 +103,7 @@ struct HttpServerState: public ServerState
    virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;
 
    public:
    virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;
 
    public:

-   virtual void Reset() APT_OVERRIDE { ServerState::Reset(); ServerFd = -1; };
+   virtual void Reset(bool const Everything = true) APT_OVERRIDE;

 
    virtual bool RunData(FileFd * const File) APT_OVERRIDE;
    virtual bool RunDataToDevNull() APT_OVERRIDE;
 
    virtual bool RunData(FileFd * const File) APT_OVERRIDE;
    virtual bool RunDataToDevNull() APT_OVERRIDE;


@@ -126,8 +126,6 @@ class HttpMethod : public ServerMethod
    public:
    virtual void SendReq(FetchItem *Itm) APT_OVERRIDE;
 
    public:
    virtual void SendReq(FetchItem *Itm) APT_OVERRIDE;
 

-   virtual bool Configuration(std::string Message) APT_OVERRIDE;
-

    virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
    virtual void RotateDNS() APT_OVERRIDE;
    virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res) APT_OVERRIDE;
    virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
    virtual void RotateDNS() APT_OVERRIDE;
    virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res) APT_OVERRIDE;


@@ -138,11 +136,7 @@ class HttpMethod : public ServerMethod
    public:
    friend struct HttpServerState;
 
    public:
    friend struct HttpServerState;
 

-   HttpMethod() : ServerMethod("http", "1.2",Pipeline | SendConfig)
-   {
-      File = 0;
-      Server = 0;
-   };
+   explicit HttpMethod(std::string &&pProg);

 };
 
 #endif
 };
 
 #endif