Add support for HTTP methods to unblock storage team (#158)
* Support all HTTP methods * Add const qualifier * fix compiler error on some platforms
This commit is contained in:
parent
5fc6fea9f4
commit
11f842bfbe
@ -129,6 +129,27 @@ namespace Azure { namespace Core { namespace Http {
|
||||
Patch,
|
||||
};
|
||||
|
||||
inline std::string HttpMethodToString(const HttpMethod& method)
|
||||
{
|
||||
switch (method)
|
||||
{
|
||||
case HttpMethod::Get:
|
||||
return "GET";
|
||||
case HttpMethod::Head:
|
||||
return "HEAD";
|
||||
case HttpMethod::Post:
|
||||
return "POST";
|
||||
case HttpMethod::Put:
|
||||
return "PUT";
|
||||
case HttpMethod::Delete:
|
||||
return "DELETE";
|
||||
case HttpMethod::Patch:
|
||||
return "PATCH";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
class Request {
|
||||
|
||||
private:
|
||||
@ -228,9 +249,9 @@ namespace Azure { namespace Core { namespace Http {
|
||||
void StartRetry(); // only called by retry policy
|
||||
|
||||
// Methods used by transport layer (and logger) to send request
|
||||
HttpMethod GetMethod();
|
||||
std::string GetEncodedUrl(); // should return encoded url
|
||||
std::map<std::string, std::string> GetHeaders();
|
||||
HttpMethod GetMethod() const;
|
||||
std::string GetEncodedUrl() const; // should return encoded url
|
||||
std::map<std::string, std::string> GetHeaders() const;
|
||||
BodyStream* GetBodyStream();
|
||||
std::vector<uint8_t> const& GetBodyBuffer();
|
||||
};
|
||||
|
||||
@ -45,6 +45,33 @@ CURLcode CurlTransport::Perform(Context& context, Request& request)
|
||||
return settingUp;
|
||||
}
|
||||
|
||||
if (request.GetMethod() == HttpMethod::Get)
|
||||
{
|
||||
settingUp = curl_easy_setopt(m_pCurl, CURLOPT_HTTPGET, 1L);
|
||||
}
|
||||
else if (request.GetMethod() == HttpMethod::Put)
|
||||
{
|
||||
settingUp = curl_easy_setopt(m_pCurl, CURLOPT_PUT, 1L);
|
||||
}
|
||||
else
|
||||
{
|
||||
settingUp
|
||||
= curl_easy_setopt(m_pCurl, CURLOPT_CUSTOMREQUEST, HttpMethodToString(request.GetMethod()).data());
|
||||
}
|
||||
if (settingUp != CURLE_OK)
|
||||
{
|
||||
return settingUp;
|
||||
}
|
||||
|
||||
if (request.GetMethod() == HttpMethod::Head)
|
||||
{
|
||||
settingUp = curl_easy_setopt(m_pCurl, CURLOPT_NOBODY, 1L);
|
||||
if (settingUp != CURLE_OK)
|
||||
{
|
||||
return settingUp;
|
||||
}
|
||||
}
|
||||
|
||||
settingUp = SetHeaders(request);
|
||||
if (settingUp != CURLE_OK)
|
||||
{
|
||||
|
||||
@ -42,9 +42,9 @@ void Request::StartRetry()
|
||||
this->m_retryHeaders.clear();
|
||||
}
|
||||
|
||||
HttpMethod Request::GetMethod() { return this->_method; }
|
||||
HttpMethod Request::GetMethod() const { return this->_method; }
|
||||
|
||||
std::string Request::GetEncodedUrl()
|
||||
std::string Request::GetEncodedUrl() const
|
||||
{
|
||||
if (this->m_queryParameters.size() == 0 && this->m_retryQueryParameters.size() == 0)
|
||||
{
|
||||
@ -63,7 +63,7 @@ std::string Request::GetEncodedUrl()
|
||||
return _url + queryString;
|
||||
}
|
||||
|
||||
std::map<std::string, std::string> Request::GetHeaders()
|
||||
std::map<std::string, std::string> Request::GetHeaders() const
|
||||
{
|
||||
// create map with retry headers witch are the most important and we don't want
|
||||
// to override them with any duplicate header
|
||||
|
||||
Loading…
Reference in New Issue
Block a user