Support CURL based HTTP client

Author: franksinankaya

Release/CMakeLists.txt

@@ -61,6 +61,7 @@ endif()
 
 include(cmake/cpprest_find_boost.cmake)
 include(cmake/cpprest_find_zlib.cmake)
+include(cmake/cpprest_find_curl.cmake)
 include(cmake/cpprest_find_openssl.cmake)
 include(cmake/cpprest_find_websocketpp.cmake)
 include(cmake/cpprest_find_brotli.cmake)
@@ -164,7 +165,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   message("-- Setting gcc options")
 
-  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code)
+  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wno-unused-parameter -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code)
   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")

Release/cmake/cpprest_find_curl.cmake

@@ -0,0 +1,17 @@
+function(cpprest_find_curl)
+  if(TARGET cpprestsdk_curl_internal)
+    return()
+  endif()
+
+  if(NOT CURL_LIBRARY OR NOT CURL_INCLUDE_DIRS)
+    find_package(CURL REQUIRED)
+  endif()
+
+  add_library(cpprestsdk_curl_internal INTERFACE)
+  if(TARGET CURL::CURL)
+    target_link_libraries(cpprestsdk_curl_internal INTERFACE CURL::CURL)
+  else()
+    target_link_libraries(cpprestsdk_curl_internal INTERFACE "$<BUILD_INTERFACE:${CURL_LIBRARY}>")
+    target_include_directories(cpprestsdk_curl_internal INTERFACE "$<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>")
+  endif()
+endfunction()

Release/cmake/cpprestsdk-config.in.cmake

@@ -11,6 +11,10 @@ if(@CPPREST_USES_OPENSSL@)
   find_dependency(OpenSSL)
 endif()
 
+if(@CPPREST_USES_CURL@)
+  find_dependency(CURL)
+endif()
+
 if(@CPPREST_USES_BOOST@ AND OFF)
   if(UNIX)
     find_dependency(Boost COMPONENTS random system thread filesystem chrono atomic date_time regex)

Release/include/cpprest/http_client.h

@@ -104,9 +104,7 @@ class http_client_config
 #if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_CLIENT_ASIO)
         , m_tlsext_sni_enabled(true)
 #endif
-#if defined(_WIN32) && !defined(__cplusplus_winrt)
         , m_buffer_request(false)
-#endif
     {
     }
 
@@ -262,7 +260,6 @@ class http_client_config
     void set_validate_certificates(bool validate_certs) { m_validate_certificates = validate_certs; }
 #endif
 
-#if defined(_WIN32) && !defined(__cplusplus_winrt)
     /// <summary>
     /// Checks if request data buffering is turned on, the default is off.
     /// </summary>
@@ -277,7 +274,6 @@ class http_client_config
     /// <param name="buffer_request">True to turn on buffer, false otherwise.</param>
     /// <remarks>Please note there is a performance cost due to copying the request data.</remarks>
     void set_buffer_request(bool buffer_request) { m_buffer_request = buffer_request; }
-#endif
 
     /// <summary>
     /// Sets a callback to enable custom setting of platform specific options.
@@ -389,9 +385,7 @@ class http_client_config
     std::function<void(boost::asio::ssl::context&)> m_ssl_context_callback;
     bool m_tlsext_sni_enabled;
 #endif
-#if defined(_WIN32) && !defined(__cplusplus_winrt)
     bool m_buffer_request;
-#endif
 };
 
 class http_pipeline;

Release/src/CMakeLists.txt

@@ -131,6 +131,13 @@ if(CPPREST_HTTP_CLIENT_IMPL STREQUAL "asio")
   target_compile_definitions(cpprest PUBLIC -DCPPREST_FORCE_HTTP_CLIENT_ASIO)
   target_sources(cpprest PRIVATE http/client/http_client_asio.cpp http/client/x509_cert_utilities.cpp)
   target_link_libraries(cpprest PUBLIC cpprestsdk_boost_internal cpprestsdk_openssl_internal)
+elseif(CPPREST_HTTP_CLIENT_IMPL STREQUAL "curl")
+  cpprest_find_boost()
+  cpprest_find_openssl()
+  cpprest_find_curl()
+  target_compile_definitions(cpprest PUBLIC -DCPPREST_FORCE_HTTP_CLIENT_CURL)
+  target_sources(cpprest PRIVATE http/client/http_client_curl.cpp http/client/winhttppal/winhttppal.cpp http/client/x509_cert_utilities.cpp)
+  target_link_libraries(cpprest PUBLIC cpprestsdk_boost_internal cpprestsdk_openssl_internal cpprestsdk_curl_internal)
 elseif(CPPREST_HTTP_CLIENT_IMPL STREQUAL "winhttp")
   target_link_libraries(cpprest PRIVATE
     httpapi.lib
@@ -248,6 +255,7 @@ if(CPPREST_INSTALL)
   set(CPPREST_USES_ZLIB OFF)
   set(CPPREST_USES_BROTLI OFF)
   set(CPPREST_USES_OPENSSL OFF)
+  set(CPPREST_USES_CURL OFF)
 
   set(CPPREST_TARGETS cpprest)
   if(TARGET cpprestsdk_boost_internal)
@@ -266,6 +274,10 @@ if(CPPREST_INSTALL)
     list(APPEND CPPREST_TARGETS cpprestsdk_openssl_internal)
     set(CPPREST_USES_OPENSSL ON)
   endif()
+  if(TARGET cpprestsdk_curl_internal)
+    list(APPEND CPPREST_TARGETS cpprestsdk_curl_internal)
+    set(CPPREST_USES_CURL ON)
+  endif()
   if(TARGET cpprestsdk_websocketpp_internal)
     list(APPEND CPPREST_TARGETS cpprestsdk_websocketpp_internal)
   endif()