Merge branch 'master' of https://github.com/xqp/cpprestsdk into xqp-master

Author: ras0219-msft

Release/include/cpprest/http_client.h

@@ -312,6 +312,35 @@ class http_client_config
     }
 #endif
 
+    /// <summary>
+    /// Sets a callback to enable custom setting of platform specific options.
+    /// </summary>
+    /// <remarks>
+    /// The native_handle is the following type depending on the underlying platform:
+    ///     Windows Desktop, WinHTTP - HINTERNET
+    ///     Windows Runtime, WinRT - IXMLHTTPRequest2 *
+    ///     All other platforms, Boost.Asio:
+    ///         https - boost::asio::ssl::stream<boost::asio::ip::tcp::socket &> *
+    ///         http - boost::asio::ip::tcp::socket *
+    /// </remarks>
+    /// <param name="callback">A user callback allowing for customization of the session</param>
+    void set_nativesessionhandle_options(const std::function<void(native_handle)> &callback)
+    {
+        m_set_user_nativesessionhandle_options = callback;
+    }
+
+    /// <summary>
+    /// Invokes a user's callback to allow for customization of the session.
+    /// </summary>
+    /// <param name="handle">A internal implementation handle.</param>
+    void invoke_nativesessionhandle_options(native_handle handle) const
+    {
+        if (m_set_user_nativesessionhandle_options != nullptr) {
+            m_set_user_nativesessionhandle_options(handle);
+        }
+    }
+
+
     /// <summary>
     /// Sets a callback to enable custom setting of platform specific options.
     /// </summary>
@@ -397,6 +426,7 @@ class http_client_config
 #endif
 
     std::function<void(native_handle)> m_set_user_nativehandle_options;
+	std::function<void(native_handle)> m_set_user_nativesessionhandle_options;
 
 #if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_CLIENT_ASIO)
     std::function<void(boost::asio::ssl::context&)> m_ssl_context_callback;

Release/src/http/client/http_client_winhttp.cpp

@@ -448,14 +448,23 @@ class winhttp_client : public _http_client_communicator
             }
         }
 #endif
-		//Enable TLS 1.1 and 1.2
+        //Enable TLS 1.1 and 1.2
         HRESULT result(S_OK);
         BOOL win32_result(FALSE);
 
         DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2);
         win32_result = ::WinHttpSetOption(m_hSession, WINHTTP_OPTION_SECURE_PROTOCOLS, &secure_protocols, sizeof(secure_protocols));
         if(FALSE == win32_result){ result = HRESULT_FROM_WIN32(::GetLastError()); }
 
+        try
+        {
+            client_config().invoke_nativesessionhandle_options(m_hSession);
+        }
+        catch (...)
+        {
+            return report_failure(_XPLATSTR("Error in session handle callback"));
+        }
+
         // Register asynchronous callback.
         if(WINHTTP_INVALID_STATUS_CALLBACK == WinHttpSetStatusCallback(
             m_hSession,