rename ServerMethod to BaseHttpMethod

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index b460644dd5590cf3b3abb39fd0957cb37b3a8eef..9f595954894a1902fe792d18fdd7ae9ae17bce48 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -977,10 +977,10 @@ void HttpMethod::RotateDNS()                                              /*{{{*/
    ::RotateDNS();
 }
                                                                        /*}}}*/
-ServerMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)/*{{{*/
+BaseHttpMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)/*{{{*/
 {
-   auto ret = ServerMethod::DealWithHeaders(Res, Req);
-   if (ret != ServerMethod::FILE_IS_OPEN)
+   auto ret = BaseHttpMethod::DealWithHeaders(Res, Req);
+   if (ret != BaseHttpMethod::FILE_IS_OPEN)
       return ret;
    if (Req.File.Open(Queue->DestFile, FileFd::WriteAny) == false)
       return ERROR_NOT_FROM_SERVER;
@@ -1002,7 +1002,7 @@ ServerMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res
    return FILE_IS_OPEN;
 }
                                                                        /*}}}*/
-HttpMethod::HttpMethod(std::string &&pProg) : ServerMethod(pProg.c_str(), "1.2", Pipeline | SendConfig)/*{{{*/
+HttpMethod::HttpMethod(std::string &&pProg) : BaseHttpMethod(pProg.c_str(), "1.2", Pipeline | SendConfig)/*{{{*/
 {
    auto addName = std::inserter(methodNames, methodNames.begin());
    if (Binary != "http")