db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Update comment and parameter in HttpRequest.

Browse Source
This commit is contained in:
David Steele 2020-07-15 13:54:01 -04:00
parent 88b0f6245d
commit 50ff5d905e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/xml/release.xml
View File

@ -57,6 +57,11 @@
<release-item>
<commit subject="Asynchronous S3 multipart upload."/>
<commit subject="Rename httpRequest() to httpRequestResponse() and fix comment."/>
<commit subject="Update comment and parameter in HttpRequest."/>
<release-item-contributor-list>
<release-item-reviewer id="stephen.frost"/>
</release-item-contributor-list>
<p>Asynchronous S3 multipart upload.</p>
</release-item>

16
src/common/io/http/request.c
View File

@ -60,11 +60,11 @@ OBJECT_DEFINE_GET(Header, const, HTTP_REQUEST, const HttpHeader *, header);
Process the request
***********************************************************************************************************************************/
static HttpResponse *
httpRequestProcess(HttpRequest *this, bool requestOnly, bool contentCache)
httpRequestProcess(HttpRequest *this, bool waitForResponse, bool contentCache)
{
FUNCTION_LOG_BEGIN(logLevelDebug)
FUNCTION_LOG_PARAM(HTTP_REQUEST, this);
FUNCTION_LOG_PARAM(BOOL, requestOnly);
FUNCTION_LOG_PARAM(BOOL, waitForResponse);
FUNCTION_LOG_PARAM(BOOL, contentCache);
FUNCTION_LOG_END();
@ -128,13 +128,13 @@ httpRequestProcess(HttpRequest *this, bool requestOnly, bool contentCache)
// Flush all writes
ioWriteFlush(httpSessionIoWrite(session));
// If only performing the request then move the session to the object context
if (requestOnly)
// If not waiting for the response then move the session to the object context
if (!waitForResponse)
this->session = httpSessionMove(session, this->memContext);
}
// Wait for response
if (!requestOnly)
if (waitForResponse)
{
result = httpResponseNew(session, this->verb, contentCache);
@ -152,7 +152,7 @@ httpRequestProcess(HttpRequest *this, bool requestOnly, bool contentCache)
}
CATCH_ANY()
{
// Retry if wait time has not expired
// Sleep and then retry unless the total wait time has expired
if (waitMore(wait))
{
LOG_DEBUG_FMT("retry %s: %s", errorTypeName(errorType()), errorMessage());
@ -209,7 +209,7 @@ httpRequestNew(HttpClient *client, const String *verb, const String *uri, HttpRe
};
// Send the request
httpRequestProcess(this, true, false);
httpRequestProcess(this, false, false);
httpClientStat.request++;
}
MEM_CONTEXT_NEW_END();
@ -228,7 +228,7 @@ httpRequestResponse(HttpRequest *this, bool contentCache)
ASSERT(this != NULL);
FUNCTION_LOG_RETURN(HTTP_RESPONSE, httpRequestProcess(this, false, contentCache));
FUNCTION_LOG_RETURN(HTTP_RESPONSE, httpRequestProcess(this, true, contentCache));
}
/**********************************************************************************************************************************/