Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
f236b485
Commit
f236b485
authored
6 years ago
by
Sergey Linev
Committed by
Axel Naumann
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
http: remove args list, used in depricated methods
parent
c4603374
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
net/http/inc/THttpServer.h
+0
-1
0 additions, 1 deletion
net/http/inc/THttpServer.h
net/http/src/THttpServer.cxx
+0
-45
0 additions, 45 deletions
net/http/src/THttpServer.cxx
with
0 additions
and
46 deletions
net/http/inc/THttpServer.h
+
0
−
1
View file @
f236b485
...
@@ -52,7 +52,6 @@ protected:
...
@@ -52,7 +52,6 @@ protected:
std
::
string
fCors
;
///<! CORS: sets Access-Control-Allow-Origin header for ProcessRequest responses
std
::
string
fCors
;
///<! CORS: sets Access-Control-Allow-Origin header for ProcessRequest responses
std
::
mutex
fMutex
;
///<! mutex to protect list with arguments
std
::
mutex
fMutex
;
///<! mutex to protect list with arguments
TList
fCallArgs
;
///<! submitted arguments (deprecated)
std
::
queue
<
std
::
shared_ptr
<
THttpCallArg
>>
fArgs
;
///<! submitted arguments
std
::
queue
<
std
::
shared_ptr
<
THttpCallArg
>>
fArgs
;
///<! submitted arguments
std
::
mutex
fWSMutex
;
///<! mutex to protect WS handler lists
std
::
mutex
fWSMutex
;
///<! mutex to protect WS handler lists
...
...
This diff is collapsed.
Click to expand it.
net/http/src/THttpServer.cxx
+
0
−
45
View file @
f236b485
...
@@ -208,24 +208,6 @@ THttpServer::~THttpServer()
...
@@ -208,24 +208,6 @@ THttpServer::~THttpServer()
{
{
StopServerThread
();
StopServerThread
();
THttpCallArg
*
arg
=
nullptr
;
Bool_t
owner
=
kFALSE
;
while
(
true
)
{
// delete outside the locked mutex area
if
(
owner
&&
arg
)
delete
arg
;
std
::
unique_lock
<
std
::
mutex
>
lk
(
fMutex
);
if
(
fCallArgs
.
GetSize
()
==
0
)
break
;
arg
=
static_cast
<
THttpCallArg
*>
(
fCallArgs
.
First
());
const
char
*
opt
=
fCallArgs
.
FirstLink
()
->
GetAddOption
();
owner
=
opt
&&
!
strcmp
(
opt
,
"owner"
);
fCallArgs
.
RemoveFirst
();
}
if
(
fTerminated
)
{
if
(
fTerminated
)
{
TIter
iter
(
&
fEngines
);
TIter
iter
(
&
fEngines
);
THttpEngine
*
engine
=
nullptr
;
THttpEngine
*
engine
=
nullptr
;
...
@@ -670,33 +652,6 @@ Int_t THttpServer::ProcessRequests()
...
@@ -670,33 +652,6 @@ Int_t THttpServer::ProcessRequests()
arg
->
NotifyCondition
();
arg
->
NotifyCondition
();
}
}
// then process old-style queue, will be removed later
while
(
true
)
{
THttpCallArg
*
arg
=
nullptr
;
lk
.
lock
();
if
(
fCallArgs
.
GetSize
()
>
0
)
{
arg
=
static_cast
<
THttpCallArg
*>
(
fCallArgs
.
First
());
fCallArgs
.
RemoveFirst
();
}
lk
.
unlock
();
if
(
!
arg
)
break
;
fSniffer
->
SetCurrentCallArg
(
arg
);
try
{
cnt
++
;
ProcessRequest
(
arg
);
fSniffer
->
SetCurrentCallArg
(
nullptr
);
}
catch
(...)
{
fSniffer
->
SetCurrentCallArg
(
nullptr
);
}
arg
->
NotifyCondition
();
}
// regularly call Process() method of engine to let perform actions in ROOT context
// regularly call Process() method of engine to let perform actions in ROOT context
TIter
iter
(
&
fEngines
);
TIter
iter
(
&
fEngines
);
THttpEngine
*
engine
=
nullptr
;
THttpEngine
*
engine
=
nullptr
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment