From 5835b7768670e55ee73a13faf3489404fbc6cecb Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Wed, 27 Jan 2021 17:54:34 +0100
Subject: [PATCH] [http] remove deprecated signature of
THttpServer::ProcessRequest
---
net/http/inc/THttpServer.h | 3 ---
net/http/src/THttpLongPollEngine.cxx | 4 ++--
net/http/src/THttpServer.cxx | 16 ----------------
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/net/http/inc/THttpServer.h b/net/http/inc/THttpServer.h
index 8998bc13c0d..8917892a72a 100644
--- a/net/http/inc/THttpServer.h
+++ b/net/http/inc/THttpServer.h
@@ -38,7 +38,6 @@ protected:
Long_t fMainThrdId{0}; ///<! id of the thread for processing requests
Bool_t fOwnThread{kFALSE}; ///<! true when specialized thread allocated for processing requests
std::thread fThrd; ///<! own thread
- Bool_t fOldProcessSignature{kFALSE}; ///<! flag used to detect usage of old signature of Process() method
TString fJSROOTSYS; ///<! location of local JSROOT files
TString fTopName{"ROOT"}; ///<! name of top folder, default - "ROOT"
@@ -64,8 +63,6 @@ protected:
virtual void ProcessBatchHolder(std::shared_ptr<THttpCallArg> &arg);
- virtual void ProcessRequest(THttpCallArg *arg);
-
void StopServerThread();
static Bool_t VerifyFilePath(const char *fname);
diff --git a/net/http/src/THttpLongPollEngine.cxx b/net/http/src/THttpLongPollEngine.cxx
index f938c8ec6e7..40826e14d84 100644
--- a/net/http/src/THttpLongPollEngine.cxx
+++ b/net/http/src/THttpLongPollEngine.cxx
@@ -188,10 +188,10 @@ Bool_t THttpLongPollEngine::PreProcess(std::shared_ptr<THttpCallArg> &arg)
}
if (arg == poll)
- Fatal("PreviewData", "Submit same THttpCallArg object once again");
+ Fatal("PreProcess", "Submit same THttpCallArg object once again");
if (poll) {
- Error("PreviewData", "Get next dummy request when previous not completed");
+ Error("PreProcess", "Get next dummy request when previous not completed");
// if there are pending request, reply it immediately
// normally should never happen
if (fRaw) poll->SetBinaryContent(std::string("txt:") + gLongPollNope);
diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx
index 769308902b5..32fc97543bc 100644
--- a/net/http/src/THttpServer.cxx
+++ b/net/http/src/THttpServer.cxx
@@ -713,14 +713,6 @@ void THttpServer::ProcessRequest(std::shared_ptr<THttpCallArg> arg)
return;
}
- // this is just to support old Process(THttpCallArg*), should be deprecated after 6.20
- fOldProcessSignature = kTRUE;
- ProcessRequest(arg.get());
- if (fOldProcessSignature) {
- Error("ProcessRequest", "Deprecated signature is used, please used std::shared_ptr<THttpCallArg>");
- return;
- }
-
if (arg->fFileName.IsNull() || (arg->fFileName == "index.htm") || (arg->fFileName == "default.htm")) {
if (arg->fFileName == "default.htm") {
@@ -964,14 +956,6 @@ void THttpServer::ProcessRequest(std::shared_ptr<THttpCallArg> arg)
arg->AddHeader("Access-Control-Allow-Origin", GetCors());
}
-////////////////////////////////////////////////////////////////////////////////
-/// \deprecated One should use signature with std::shared_ptr
-
-void THttpServer::ProcessRequest(THttpCallArg *)
-{
- fOldProcessSignature = kFALSE;
-}
-
////////////////////////////////////////////////////////////////////////////////
/// Register object in folders hierarchy
///
--
GitLab