diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/HttpTypes.h b/src/aws-cpp-sdk-core/include/aws/core/http/HttpTypes.h index 38a42539fe4..084190f75ee 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/HttpTypes.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/HttpTypes.h @@ -20,42 +20,36 @@ namespace Aws /** * Models Http methods. */ - enum class HttpMethod - { - HTTP_GET, - HTTP_POST, - HTTP_DELETE, - HTTP_PUT, - HTTP_HEAD, - HTTP_PATCH - }; - - /** - * Possible default http factory vended http client implementations. - */ - enum class TransferLibType - { - DEFAULT_CLIENT = 0, - CURL_CLIENT, - WIN_INET_CLIENT, - WIN_HTTP_CLIENT - }; - - /** - * Configuration for a HTTP client, currently used only by libCurl - */ - enum class TransferLibPerformanceMode - { - LOW_LATENCY = 0, // run http client for a lower latency, at the expense of CPU - REGULAR - }; - - namespace HttpMethodMapper - { - /** - * Gets the string value of an httpMethod. - */ - AWS_CORE_API const char* GetNameForHttpMethod(HttpMethod httpMethod); + enum class HttpMethod { + HTTP_GET, + HTTP_POST, + HTTP_DELETE, + HTTP_PUT, + HTTP_HEAD, + HTTP_PATCH, + HTTP_CONNECT, + HTTP_OPTIONS, + HTTP_TRACE, + }; + + /** + * Possible default http factory vended http client implementations. + */ + enum class TransferLibType { DEFAULT_CLIENT = 0, CURL_CLIENT, WIN_INET_CLIENT, WIN_HTTP_CLIENT }; + + /** + * Configuration for a HTTP client, currently used only by libCurl + */ + enum class TransferLibPerformanceMode { + LOW_LATENCY = 0, // run http client for a lower latency, at the expense of CPU + REGULAR + }; + + namespace HttpMethodMapper { + /** + * Gets the string value of an httpMethod. + */ + AWS_CORE_API const char* GetNameForHttpMethod(HttpMethod httpMethod); } // namespace HttpMethodMapper typedef std::pair HeaderValuePair; diff --git a/src/aws-cpp-sdk-core/source/http/HttpTypes.cpp b/src/aws-cpp-sdk-core/source/http/HttpTypes.cpp index 4d313e52f39..bb875b934b1 100644 --- a/src/aws-cpp-sdk-core/source/http/HttpTypes.cpp +++ b/src/aws-cpp-sdk-core/source/http/HttpTypes.cpp @@ -31,9 +31,15 @@ const char* GetNameForHttpMethod(HttpMethod httpMethod) return "HEAD"; case HttpMethod::HTTP_PATCH: return "PATCH"; + case HttpMethod::HTTP_CONNECT: + return "CONNECT"; + case HttpMethod::HTTP_OPTIONS: + return "OPTIONS"; + case HttpMethod::HTTP_TRACE: + return "TRACE"; default: - assert(0); - return "GET"; + assert(0); + return "GET"; } }