Merge branch 'master' into xqp-feature/get_human_readable_ssl_errors

Author: ras0219-msft

.gitignore

@@ -66,4 +66,8 @@ Intermediate/
 .vs/
 # Ignore cmake building directories
 build.*/
-docs/
+docs/
+# ignore NuGet artifacts
+.nuget/
+
+Generated Files/

Build/version.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>9</CppRestSDKVersionMinor>
+    <CppRestSDKVersionMinor>10</CppRestSDKVersionMinor>
     <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>

Build_android/openssl/Makefile

@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-OPENSSL_VER = openssl-1.0.2d
+OPENSSL_VER = openssl-1.0.2k
 
 all: armeabi-v7a/lib/libssl.a x86/lib/libssl.a
 

NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="repositoryPath" value="packages" />
+  </config>
+</configuration>

README.md

@@ -24,6 +24,33 @@ For other platforms, install options, how to build from source, and more, take a
 
 Once you have the library, look at our [tutorial](https://github.com/Microsoft/cpprestsdk/wiki/Getting-Started-Tutorial) to use the http_client. It walks through how to setup a project to use the C++ Rest SDK and make a basic Http request.
 
+To use from CMake:
+```cmake
+cmake_minimum_required(VERSION 3.7)
+project(main)
+
+find_path(CPPREST_INCLUDE cpprest/http_client.h)
+find_library(CPPREST_LIB NAMES cpprest_2_9d cpprest_2_9 cpprestd cpprest)
+find_package(Boost REQUIRED COMPONENTS random system thread filesystem chrono atomic date_time regex)
+find_package(OpenSSL 1.0.0 REQUIRED)
+
+add_executable(main main.cpp)
+target_include_directories(main ${CPPREST_INCLUDE})
+target_link_libraries(main
+  ${CPPREST_LIB}
+  Boost::boost
+  Boost::random
+  Boost::system
+  Boost::thread
+  Boost::filesystem
+  Boost::chrono
+  Boost::atomic
+  Boost::date_time
+  Boost::regex
+  OpenSSL::SSL
+)
+```
+
 ## What's in the SDK:
 
 *   Features - HTTP client/server, JSON, URI, asynchronous streams, WebSockets client, oAuth

Release/.gitignore

@@ -0,0 +1,6 @@
+.ninja_*
+*.ninja
+CMakeFiles/
+CMakeCache.txt
+CTestTestfile.cmake
+cmake_install.cmake

Release/CMakeLists.txt

@@ -1,18 +1,22 @@
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
 if(POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW) # use MACOSX_RPATH
 endif()
-project(cpprest)
+if(UNIX)
+  project(cpprest C CXX)
+else()
+  project(cpprest CXX)
+endif()
 
 enable_testing()
 
 set(WERROR ON CACHE BOOL "Treat Warnings as Errors.")
 set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.")
 set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.")
-set(CPPREST_EXPORT_DIR lib/cpprest CACHE STRING "Directory to install CMake config files.")
-set(CPPREST_EXPORT_NAME cpprest-config CACHE STRING "Name for CMake config file.")
+set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.")
 set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.")
+set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.")
 
 if(IOS OR ANDROID)
   set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
@@ -111,7 +115,7 @@ elseif(ANDROID)
     )
 elseif(UNIX) # This includes OSX
 elseif(WIN32)
-  add_definitions(-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600)
+  add_definitions(-DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600 -DWIN32 -D_SCL_SECURE_NO_WARNINGS)
 
   if(NOT BUILD_SHARED_LIBS)
     # This causes cmake to not link the test libraries separately, but instead hold onto their object files.
@@ -120,7 +124,7 @@ elseif(WIN32)
   else()
     set(Casablanca_DEFINITIONS "" CACHE INTERNAL "Definitions for consume casablanca library")
   endif()
-  add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
+  add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS)
 else()
   message(FATAL_ERROR "-- Unsupported Build Platform.")
 endif()
@@ -132,6 +136,11 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
   if(ANDROID)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith")
+  elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
+    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
+    set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
   else()
     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
     set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
@@ -172,35 +181,35 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_SYSTEM_INCLUDE_DIRS)
 set(Casablanca_LIBRARY cpprest)
 set(Casablanca_LIBRARIES cpprest)
 get_directory_property(PARENT_DIR PARENT_DIRECTORY)
 if(NOT PARENT_DIR STREQUAL "")
   set(Casablanca_LIBRARIES ${Casablanca_LIBRARIES} PARENT_SCOPE)
 endif()
 
-# Everything in the project needs access to the casablanca include directories
-include_directories(       ${Casablanca_INCLUDE_DIRS})
-include_directories(SYSTEM ${Casablanca_SYSTEM_INCLUDE_DIRS})
-
 # Finally, the tests all use the same style declaration to build themselves, so we use a function
 function(add_casablanca_test NAME SOURCES_VAR)
   add_library(${NAME} ${TEST_LIBRARY_TARGET_TYPE} ${${SOURCES_VAR}})
   message("-- Added test library ${NAME}")
-  if (NOT TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+  if(TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+    foreach(_dep httptest_utilities common_utilities unittestpp cpprest)
+      target_include_directories(${NAME} PRIVATE $<TARGET_PROPERTY:${_dep},INTERFACE_INCLUDE_DIRECTORIES>)
+      target_compile_definitions(${NAME} PRIVATE $<TARGET_PROPERTY:${_dep},INTERFACE_COMPILE_DEFINITIONS>)
+    endforeach()
+  else()
     target_link_libraries(${NAME}
       httptest_utilities
       common_utilities
       unittestpp
       cpprest
       ${ANDROID_STL_FLAGS}
-      )
+    )
     if (BUILD_SHARED_LIBS)
       add_test(NAME ${NAME}
         WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         COMMAND test_runner $<TARGET_FILE_NAME:${NAME}>
-        )
+      )
     endif()
   endif()
 endfunction()

Release/cmake/cpprest_find_boost.cmake

@@ -1,13 +1,12 @@
 function(cpprest_find_boost)
-  if(Boost_FOUND)
+  if(TARGET cpprestsdk_boost_internal)
     return()
   endif()
 
   if(IOS)
     set(IOS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../Build_iOS")
-    set(Boost_FOUND 1 CACHE INTERNAL "")
-    set(Boost_FRAMEWORK "-F ${IOS_SOURCE_DIR} -framework boost" CACHE INTERNAL "")
-    set(Boost_INCLUDE_DIR "$<BUILD_INTERFACE:${IOS_SOURCE_DIR}/boost.framework/Headers>" CACHE INTERNAL "")
+    set(Boost_LIBRARIES "${IOS_SOURCE_DIR}/boost.framework/boost" CACHE INTERNAL "")
+    set(Boost_INCLUDE_DIR "${IOS_SOURCE_DIR}/boost.framework/Headers" CACHE INTERNAL "")
   elseif(ANDROID)
     set(Boost_COMPILER "-clang")
     if(ARM)
@@ -24,17 +23,57 @@ function(cpprest_find_boost)
     find_package(Boost REQUIRED COMPONENTS system date_time regex)
   endif()
 
-  set(Boost_FOUND 1 CACHE INTERNAL "")
-  set(Boost_INCLUDE_DIR ${Boost_INCLUDE_DIR} CACHE INTERNAL "")
-  set(Boost_LIBRARIES
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_ATOMIC_LIBRARY}
-    ${Boost_CHRONO_LIBRARY}
-    ${Boost_RANDOM_LIBRARY}
-    ${Boost_REGEX_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${BOOST_FRAMEWORK}
-    CACHE INTERNAL "")
- endfunction()
+  add_library(cpprestsdk_boost_internal INTERFACE)
+  # FindBoost continually breaks imported targets whenever boost updates.
+  if(1)
+    target_include_directories(cpprestsdk_boost_internal INTERFACE "$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>")
+    set(_prev)
+    set(_libs)
+    foreach(_lib ${Boost_LIBRARIES})
+      if(_lib STREQUAL "optimized" OR _lib STREQUAL "debug")
+      else()
+        if(_prev STREQUAL "optimized")
+          list(APPEND _libs "$<$<NOT:$<CONFIG:Debug>>:${_lib}>")
+        elseif(_prev STREQUAL "debug")
+        list(APPEND _libs "$<$<CONFIG:Debug>:${_lib}>")
+        else()
+        list(APPEND _libs "${_lib}")
+        endif()
+      endif()
+      set(_prev "${_lib}")
+    endforeach()
+    target_link_libraries(cpprestsdk_boost_internal INTERFACE "$<BUILD_INTERFACE:${_libs}>")
+
+  else()
+    if(ANDROID)
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::random
+        Boost::system
+        Boost::thread
+        Boost::filesystem
+        Boost::chrono
+        Boost::atomic
+      )
+    elseif(UNIX)
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::random
+        Boost::system
+        Boost::thread
+        Boost::filesystem
+        Boost::chrono
+        Boost::atomic
+        Boost::date_time
+        Boost::regex
+      )
+    else()
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::system
+        Boost::date_time
+        Boost::regex
+      )
+    endif()
+  endif()
+endfunction()

Release/cmake/cpprest_find_openssl.cmake

@@ -1,62 +1,70 @@
 function(cpprest_find_openssl)
-  if(OPENSSL_FOUND)
+  if(TARGET cpprestsdk_openssl_internal)
     return()
   endif()
 
   if(IOS)
     set(IOS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../Build_iOS")
-    set(OPENSSL_FOUND 1 CACHE INTERNAL "")
-    set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${IOS_SOURCE_DIR}/openssl/include>" CACHE INTERNAL "")
+
+    set(OPENSSL_INCLUDE_DIR "${IOS_SOURCE_DIR}/openssl/include" CACHE INTERNAL "")
     set(OPENSSL_LIBRARIES
       "${IOS_SOURCE_DIR}/openssl/lib/libcrypto.a"
       "${IOS_SOURCE_DIR}/openssl/lib/libssl.a"
       CACHE INTERNAL ""
       )
     set(_SSL_LEAK_SUPPRESS_AVAILABLE ON CACHE INTERNAL "")
-    return()
   elseif(ANDROID)
-    set(OPENSSL_FOUND 1 CACHE INTERNAL "")
     if(ARM)
-      set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include>" CACHE INTERNAL "")
+      set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include" CACHE INTERNAL "")
       set(OPENSSL_LIBRARIES
         "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libssl.a"
         "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libcrypto.a"
         CACHE INTERNAL ""
         )
     else()
-      set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/../openssl/x86/include>" CACHE INTERNAL "")
+      set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/x86/include" CACHE INTERNAL "")
       set(OPENSSL_LIBRARIES
         "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libssl.a"
         "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libcrypto.a"
         CACHE INTERNAL ""
         )
     endif()
-  elseif(APPLE)
-    if(NOT DEFINED OPENSSL_ROOT_DIR)
-      # Prefer a homebrew version of OpenSSL over the one in /usr/lib
-      file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
-      # Prefer the latest (make the latest one first)
-      list(REVERSE OPENSSL_ROOT_DIR)
-    endif()
-    # This should prevent linking against the system provided 0.9.8y
-    set(_OPENSSL_VERSION "")
-    find_package(OpenSSL 1.0.0 REQUIRED)
+    set(_SSL_LEAK_SUPPRESS_AVAILABLE ON CACHE INTERNAL "")
   else()
+    if(APPLE)
+      if(NOT DEFINED OPENSSL_ROOT_DIR)
+        # Prefer a homebrew version of OpenSSL over the one in /usr/lib
+        file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
+        # Prefer the latest (make the latest one first)
+        list(REVERSE OPENSSL_ROOT_DIR)
+      endif()
+      # This should prevent linking against the system provided 0.9.8y
+      set(_OPENSSL_VERSION "")
+    endif()
     find_package(OpenSSL 1.0.0 REQUIRED)
+
+    INCLUDE(CheckCXXSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+    CHECK_CXX_SOURCE_COMPILES("
+      #include <openssl/ssl.h>
+      int main()
+      {
+      ::SSL_COMP_free_compression_methods();
+      }
+    " _SSL_LEAK_SUPPRESS_AVAILABLE)
   endif()
 
-  set(OPENSSL_FOUND 1 CACHE INTERNAL "")
-  set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR} CACHE INTERNAL "")
-  set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} CACHE INTERNAL "")
+  add_library(cpprestsdk_openssl_internal INTERFACE)
+  if(TARGET OpenSSL::SSL)
+    target_link_libraries(cpprestsdk_openssl_internal INTERFACE OpenSSL::SSL)
+  else()
+    target_link_libraries(cpprestsdk_openssl_internal INTERFACE "$<BUILD_INTERFACE:${OPENSSL_LIBRARIES}>")
+    target_include_directories(cpprestsdk_openssl_internal INTERFACE "$<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>")
+  endif()
 
-  INCLUDE(CheckCXXSourceCompiles)
-  set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-  set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
-  CHECK_CXX_SOURCE_COMPILES("
-    #include <openssl/ssl.h>
-    int main()
-    {
-    ::SSL_COMP_free_compression_methods();
-    }
-  " _SSL_LEAK_SUPPRESS_AVAILABLE)
+  if (NOT _SSL_LEAK_SUPPRESS_AVAILABLE)
+    # libressl doesn't ship with the cleanup method being used in ws_client_wspp
+    target_compile_definitions(cpprestsdk_openssl_internal INTERFACE -DCPPREST_NO_SSL_LEAK_SUPPRESS)
+  endif()
 endfunction()

Release/cmake/cpprest_find_websocketpp.cmake

@@ -1,5 +1,5 @@
 function(cpprest_find_websocketpp)
-  if(WEBSOCKETPP_FOUND)
+  if(TARGET cpprestsdk_websocketpp_internal)
     return()
   endif()
 
@@ -9,7 +9,17 @@ function(cpprest_find_websocketpp)
     set(WEBSOCKETPP_INCLUDE_DIR ${WEBSOCKETPP_INCLUDE_DIR} CACHE INTERNAL "")
   else()
     message("-- websocketpp not found, using the embedded version")
-    set(WEBSOCKETPP_FOUND 1 CACHE INTERNAL "" FORCE)
     set(WEBSOCKETPP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/libs/websocketpp CACHE INTERNAL "")
   endif()
+
+  cpprest_find_boost()
+  cpprest_find_openssl()
+
+  add_library(cpprestsdk_websocketpp_internal INTERFACE)
+  target_include_directories(cpprestsdk_websocketpp_internal INTERFACE "$<BUILD_INTERFACE:${WEBSOCKETPP_INCLUDE_DIR}>")
+  target_link_libraries(cpprestsdk_websocketpp_internal
+    INTERFACE
+      cpprestsdk_boost_internal
+      cpprestsdk_openssl_internal
+  )
 endfunction()