Merge branch 'master' into http_compression

Conflicts:
	cpprestsdk140.sln

Author: deeringc

Build/Common.Build.settings

@@ -36,6 +36,7 @@
   <PropertyGroup>
     <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
+    <IntDir>$(BuildRoot)\Intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
     <TestRoot>$(BuildRoot)\Release\Tests</TestRoot>
     <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>

Build/Release.Product.settings

@@ -32,7 +32,6 @@
 
   <PropertyGroup>
     <InternalIncludeDir>$(CasablancaIncludeDir)</InternalIncludeDir>
-    <IntDir>$(BuildRoot)\Intermediate\$(MSBuildProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

Build/version.props

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

Build_iOS/configure.sh

@@ -12,9 +12,11 @@ git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git
 pushd OpenSSL-for-iPhone
 ./build-libssl.sh
 popd
-mkdir openssl
-mv OpenSSL-for-iPhone/include openssl
-mv OpenSSL-for-iPhone/lib openssl
+mkdir -p openssl/lib
+cp -r OpenSSL-for-iPhone/bin/iPhoneOS8.2-armv7.sdk/include openssl
+cp OpenSSL-for-iPhone/include/LICENSE openssl
+lipo -create -output openssl/lib/libssl.a OpenSSL-for-iPhone/bin/iPhone*/lib/libssl.a
+lipo -create -output openssl/lib/libcrypto.a OpenSSL-for-iPhone/bin/iPhone*/lib/libcrypto.a
 
 git clone https://github.com/cristeab/ios-cmake.git
 pushd ios-cmake

CONTRIBUTORS.txt

@@ -34,5 +34,12 @@ Gery Vessere ([email protected])
 
 Cisco Systems
 Gergely Lukacsy (glukacsy)
+Chris Deering (deeringc)
+
+Ocedo GmbH
+Henning Pfeiffer (megaposer)
 
 thomasschaub
+
+Trimble
+Tim Boundy (gigaplex)

Release/CMakeLists.txt

@@ -101,6 +101,7 @@ elseif(WIN32)
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)
   option(BUILD_SAMPLES "Build samples." ON)
+  option(CPPREST_EXCLUDE_WEBSOCKETS "Exclude websockets functionality." OFF)
   option(Boost_USE_STATIC_LIBS ON)
 
   add_definitions(-DUNICODE -D_UNICODE)
@@ -114,8 +115,12 @@ elseif(WIN32)
   endif()
   add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
 
-  find_package(Boost 1.55 REQUIRED COMPONENTS random system thread filesystem chrono atomic)
-  find_package(OpenSSL 1.0 REQUIRED)
+  if (CPPREST_EXCLUDE_WEBSOCKETS)
+    add_definitions(-DCPPREST_EXCLUDE_WEBSOCKETS=1)
+  else()
+    find_package(Boost 1.55 REQUIRED COMPONENTS random system thread filesystem chrono atomic)
+    find_package(OpenSSL 1.0 REQUIRED)
+  endif()
 else()
   message(FATAL_ERROR "-- Unsupported Build Platform.")
 endif()
@@ -134,7 +139,7 @@ elseif((CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR IOS)
   message("-- Setting clang options")
 
   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")
+  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")
   set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
@@ -165,23 +170,34 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
-                       HINTS /usr/lib/cmake/websocketpp)
-find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
-                       HINTS /usr/lib/cmake/websocketpp)
-if(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
-  include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
-  include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
-  message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
-  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
-else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
-  set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
-  message("-- websocketpp not found, using the embedded version")
-endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
+  find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
+                        HINTS /usr/lib/cmake/websocketpp)
+  find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake
+                        HINTS /usr/lib/cmake/websocketpp)
+  if(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+    include(${WEBSOCKETPP_CONFIG}/websocketpp-config.cmake)
+    include(${WEBSOCKETPP_CONFIG}/websocketpp-configVersion.cmake)
+    message("-- Found websocketpp version " ${PACKAGE_VERSION} " on system")
+    set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${WEBSOCKETPP_INCLUDE_DIR})
+  else(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+    set(Casablanca_INCLUDE_DIRS ${Casablanca_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
+    message("-- websocketpp not found, using the embedded version")
+  endif(WEBSOCKETPP_CONFIG AND WEBSOCKETPP_CONFIG_VERSION)
+else()
+  set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
+endif()
 
 set(Casablanca_LIBRARY ${LIB}cpprest)
-set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
+set(Casablanca_LIBRARIES ${Casablanca_LIBRARY}
+  ${Boost_FILESYSTEM_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
+  ${Boost_ATOMIC_LIBRARY}
+  ${Boost_CHRONO_LIBRARY}
+  ${Boost_RANDOM_LIBRARY}
+  ${Boost_REGEX_LIBRARY}
+  ${Boost_FRAMEWORK})
 
 # Everything in the project needs access to the casablanca include directories
 include_directories(${Casablanca_INCLUDE_DIRS})

Release/include/cpprest/details/http_client_impl.h

@@ -296,11 +296,10 @@ class _http_client_communicator
     // URI to connect to.
     const http::uri m_uri;
 
-
-	http_client_config m_client_config;
-
 private:
 
+    http_client_config m_client_config;
+
     bool m_opened;
 
     pplx::extensibility::critical_section_t m_open_lock;

Release/include/cpprest/details/http_server_httpsys.h

@@ -99,6 +99,14 @@ struct windows_request_context : http::details::_http_server_context
     // Dispatch request to the provided http_listener.
     void dispatch_request_to_listener(_In_ web::http::experimental::listener::details::http_listener_impl *pListener);
 
+    enum class ShouldWaitForBody
+    {
+        Wait,
+        DontWait
+    };
+    // Initialise the response task callbacks. If the body has been requested, we should wait for it to avoid race conditions.
+    void init_response_callbacks(ShouldWaitForBody shouldWait);
+
     // Read in a portion of the request body.
     void read_request_body_chunk();
 

Release/include/cpprest/http_client.h

@@ -101,6 +101,7 @@ class http_client_config
         , m_set_user_nativehandle_options([](native_handle)->void{})
 #if !defined(_WIN32) && !defined(__cplusplus_winrt)
         , m_ssl_context_callback([](boost::asio::ssl::context&)->void{})
+        , m_tlsext_sni_enabled(true)
 #endif
 #if defined(_WIN32) && !defined(__cplusplus_winrt)
         , m_buffer_request(false)
@@ -369,6 +370,25 @@ class http_client_config
     {
         return m_ssl_context_callback;
     }
+
+    /// <summary>
+    /// Gets the TLS extension server name indication (SNI) status.
+    /// </summary>
+    /// <returns>True if TLS server name indication is enabled, false otherwise.</returns>
+    bool is_tlsext_sni_enabled() const
+    {
+        return m_tlsext_sni_enabled;
+    }
+
+    /// <summary>
+    /// Sets the TLS extension server name indication (SNI) status.
+    /// </summary>
+    /// <param name="tlsext_sni_enabled">False to disable the TLS (ClientHello) extension for server name indication, true otherwise.</param>
+    /// <remarks>Note: This setting is enabled by default as it is required in most virtual hosting scenarios.</remarks>
+    void set_tlsext_sni_enabled(bool tlsext_sni_enabled)
+    {
+        m_tlsext_sni_enabled = tlsext_sni_enabled;
+    }
 #endif
 
 private:
@@ -394,6 +414,7 @@ class http_client_config
 
 #if !defined(_WIN32) && !defined(__cplusplus_winrt)
     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;

Release/include/cpprest/oauth1.h

@@ -28,6 +28,7 @@
 #define _CASA_OAUTH1_H
 
 #include "cpprest/http_msg.h"
+#include "cpprest/details/web_utilities.h"
 
 namespace web
 {
@@ -479,6 +480,24 @@ class oauth1_config
     /// </summary>
     void clear_parameters() { m_parameters_to_sign.clear(); }
 
+    /// <summary>
+    /// Get the web proxy object
+    /// </summary>
+    /// <returns>A reference to the web proxy object.</returns>
+    const web_proxy& proxy() const
+    {
+        return m_proxy;
+    }
+
+    /// <summary>
+    /// Set the web proxy object that will be used by token_from_code and token_from_refresh
+    /// </summary>
+    /// <param name="proxy">A reference to the web proxy object.</param>
+    void set_proxy(const web_proxy& proxy)
+    {
+        m_proxy = proxy;
+    }
+
 private:
     friend class web::http::client::http_client_config;
     friend class web::http::oauth1::details::oauth1_handler;
@@ -532,6 +551,8 @@ class oauth1_config
 
 	std::map<utility::string_t, utility::string_t> m_parameters_to_sign;
 
+    web::web_proxy m_proxy;
+
     utility::nonce_generator m_nonce_generator;
     bool m_is_authorization_completed;
 };