github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Http/fix gcc 8 build (#275)

Browse Source 
* throw exception on Read from wire Error instead of returning -1
This commit is contained in:
Victor Vazquez 2020-07-13 17:20:44 -07:00 committed by GitHub
parent a1ec5119a6
commit 59d7ebabe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/core/azure-core/inc/http/http.hpp
View File

@ -265,12 +265,12 @@ namespace Azure { namespace Core { namespace Http {
*/
struct CouldNotResolveHostException : public std::exception
{
const char* what() const throw() { return "couldnt resolve host"; }
const char* what() const throw() { return "could not resolve host"; }
};
struct ErrorWhileWrittingResponse : public std::exception
{
const char* what() const throw() { return "couldnt write response"; }
const char* what() const throw() { return "could not write response"; }
};
// Any other excpetion from transport layer without an specific exception defined above

15
sdk/core/azure-core/src/http/curl/curl.cpp
View File

@ -19,13 +19,16 @@ std::unique_ptr<Response> CurlTransport::Send(Context& context, Request& request
{
switch (performing)
{
case CURLE_COULDNT_RESOLVE_HOST: {
case CURLE_COULDNT_RESOLVE_HOST:
{
throw Azure::Core::Http::CouldNotResolveHostException();
}
case CURLE_WRITE_ERROR: {
case CURLE_WRITE_ERROR:
{
throw Azure::Core::Http::ErrorWhileWrittingResponse();
}
default: {
default:
{
throw Azure::Core::Http::TransportException();
}
}
@ -155,8 +158,8 @@ static std::unique_ptr<Response> CreateHTTPResponse(
static std::unique_ptr<Response> CreateHTTPResponse(std::string const& header)
{
return CreateHTTPResponse(
reinterpret_cast<const uint8_t* const>(header.data()),
reinterpret_cast<const uint8_t* const>(header.data() + header.size()));
reinterpret_cast<const uint8_t*>(header.data()),
reinterpret_cast<const uint8_t*>(header.data() + header.size()));
}
// To wait for a socket to be ready to be read/write
@ -479,7 +482,7 @@ int64_t CurlSession::ReadSocketToBuffer(uint8_t* buffer, int64_t bufferSize)
break;
default:
// Error code while reading from socket
return -1;
throw Azure::Core::Http::TransportException();
}
}
return readBytes;

4
sdk/core/azure-core/src/http/response.cpp
View File

@ -47,8 +47,8 @@ void Response::AddHeader(uint8_t const* const begin, uint8_t const* const last)
void Response::AddHeader(std::string const& header)
{
return AddHeader(
reinterpret_cast<uint8_t const* const>(header.data()),
reinterpret_cast<uint8_t const* const>(header.data() + header.size()));
reinterpret_cast<uint8_t const*>(header.data()),
reinterpret_cast<uint8_t const*>(header.data() + header.size()));
}
void Response::AddHeader(std::string const& name, std::string const& value)