GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 661bd5dea3 into merged_master (Bitcoin PR #18363)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:14 +00:00
commit 78596942a2
4 changed files with 67 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/httpserver.cpp
View file

@ -190,7 +190,7 @@ static bool InitHTTPAllowList()
}
/** HTTP request method as string - use for logging only */
static std::string RequestMethodString(HTTPRequest::RequestMethod m)
std::string RequestMethodString(HTTPRequest::RequestMethod m)
{
switch (m) {
case HTTPRequest::GET:
@ -511,10 +511,10 @@ void HTTPEvent::trigger(struct timeval* tv)
else
evtimer_add(ev, tv); // trigger after timeval passed
}
HTTPRequest::HTTPRequest(struct evhttp_request* _req) : req(_req),
replySent(false)
HTTPRequest::HTTPRequest(struct evhttp_request* _req, bool _replySent) : req(_req), replySent(_replySent)
{
}
HTTPRequest::~HTTPRequest()
{
if (!replySent) {