Skip to content

Return HTTPSuccess when HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG is set #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aggarg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return HTTPSuccess when HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG is set #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions source/core_http_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static HTTPStatus_t addRangeHeader( HTTPRequestHeaders_t * pRequestHeaders,
* @param[in] parsingState State of the parsing on the HTTP response.
* @param[in] totalReceived The amount of network data received in the response
* buffer.
* @param[in] responseBufferLen The length of the response buffer.
* @param[in] pResponse The response information.
*
* @return Returns #HTTPSuccess if the parsing state is complete. If
* the parsing state denotes it never started, then return #HTTPNoResponse. If
Expand All @@ -147,7 +147,7 @@ static HTTPStatus_t addRangeHeader( HTTPRequestHeaders_t * pRequestHeaders,
*/
static HTTPStatus_t getFinalResponseStatus( HTTPParsingState_t parsingState,
size_t totalReceived,
size_t responseBufferLen );
const HTTPResponse_t * pResponse );

/**
* @brief Send the HTTP request over the network.
Expand Down Expand Up @@ -1984,13 +1984,13 @@ static HTTPStatus_t sendHttpBody( const TransportInterface_t * pTransport,

static HTTPStatus_t getFinalResponseStatus( HTTPParsingState_t parsingState,
size_t totalReceived,
size_t responseBufferLen )
const HTTPResponse_t * pResponse )
{
HTTPStatus_t returnStatus = HTTPSuccess;

assert( parsingState >= HTTP_PARSING_NONE &&
parsingState <= HTTP_PARSING_COMPLETE );
assert( totalReceived <= responseBufferLen );
assert( totalReceived <= pResponse->bufferLen );

/* If no parsing occurred, that means network data was never received. */
if( parsingState == HTTP_PARSING_NONE )
Expand All @@ -2002,21 +2002,26 @@ static HTTPStatus_t getFinalResponseStatus( HTTPParsingState_t parsingState,
}
else if( parsingState == HTTP_PARSING_INCOMPLETE )
{
if( totalReceived == responseBufferLen )
/* HTTP_PARSING_INCOMPLETE is okay when HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG is set
* as the body data may yet to be read from the transport. */
if( ( pResponse->respOptionFlags & HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG ) == 0 )
{
LogError( ( "Cannot receive complete response from transport"
" interface: Response buffer has insufficient "
"space: responseBufferLen=%lu",
( unsigned long ) responseBufferLen ) );
returnStatus = HTTPInsufficientMemory;
}
else
{
LogError( ( "Received partial response from transport "
"receive(): ResponseSize=%lu, TotalBufferSize=%lu",
( unsigned long ) totalReceived,
( unsigned long ) ( responseBufferLen - totalReceived ) ) );
returnStatus = HTTPPartialResponse;
if( totalReceived == pResponse->bufferLen )
{
LogError( ( "Cannot receive complete response from transport"
" interface: Response buffer has insufficient "
"space: responseBufferLen=%lu",
( unsigned long ) pResponse->bufferLen ) );
returnStatus = HTTPInsufficientMemory;
}
else
{
LogError( ( "Received partial response from transport "
"receive(): ResponseSize=%lu, TotalBufferSize=%lu",
( unsigned long ) totalReceived,
( unsigned long ) ( pResponse->bufferLen - totalReceived ) ) );
returnStatus = HTTPPartialResponse;
}
}
}
else
Expand Down Expand Up @@ -2155,7 +2160,7 @@ HTTPStatus_t HTTPClient_ReceiveAndParseHttpResponse( const TransportInterface_t
* the parsing and how much data is in the buffer. */
returnStatus = getFinalResponseStatus( parsingContext.state,
totalReceived,
pResponse->bufferLen );
pResponse );
}

return returnStatus;
Expand Down
Loading