Merge pull request microsoft#376 from xqp/master

Author: ras0219-msft

Release/include/cpprest/http_client.h

@@ -312,6 +312,29 @@ 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 (session)
+    /// </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>
+    /// <remarks>Internal Use Only</remarks>
+    /// <param name="handle">A internal implementation handle.</param>
+    void _invoke_nativesessionhandle_options(native_handle handle) const
+    {
+        m_set_user_nativesessionhandle_options(handle);
+    }
+
     /// <summary>
     /// Sets a callback to enable custom setting of platform specific options.
     /// </summary>
@@ -397,6 +420,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.cpp

@@ -205,24 +205,6 @@ _http_client_communicator::_http_client_communicator(http::uri&& address, http_c
 void _http_client_communicator::open_and_send_request(const std::shared_ptr<request_context> &request)
 {
     // First see if client needs to be opened.
-    auto error = open_if_required();
-
-    if (error != 0)
-    {
-        // Failed to open
-        request->report_error(error, _XPLATSTR("Open failed"));
-
-        // DO NOT TOUCH the this pointer after completing the request
-        // This object could be freed along with the request as it could
-        // be the last reference to this object
-        return;
-    }
-
-    send_request(request);
-}
-
-unsigned long _http_client_communicator::open_if_required()
-{
     unsigned long error = 0;
 
     if (!m_opened)
@@ -241,7 +223,18 @@ unsigned long _http_client_communicator::open_if_required()
         }
     }
 
-    return error;
+    if (error != 0)
+    {
+        // Failed to open
+        request->report_error(error, _XPLATSTR("Open failed"));
+
+        // DO NOT TOUCH the this pointer after completing the request
+        // This object could be freed along with the request as it could
+        // be the last reference to this object
+        return;
+    }
+
+    send_request(request);
 }
 
 inline void request_context::finish()

Release/src/http/client/http_client_impl.h

@@ -130,16 +130,14 @@ class _http_client_communicator : public http_pipeline_stage
 
     http_client_config m_client_config;
 
-    bool m_opened;
+    std::atomic<bool> m_opened;
 
     pplx::extensibility::critical_section_t m_open_lock;
 
     // Wraps opening the client around sending a request.
     void open_and_send_request_async(const std::shared_ptr<request_context> &request);
     void open_and_send_request(const std::shared_ptr<request_context> &request);
 
-    unsigned long open_if_required();
-
     // Queue used to guarantee ordering of requests, when applicable.
     std::queue<std::shared_ptr<request_context>> m_requests_queue;
     int m_scheduled;

Release/src/http/client/http_client_winhttp.cpp

@@ -356,7 +356,7 @@ class winhttp_client : public _http_client_communicator
     }
 
     // Open session and connection with the server.
-    unsigned long open()
+    virtual unsigned long open() override
     {
         DWORD access_type;
         LPCWSTR proxy_name;
@@ -448,13 +448,17 @@ class winhttp_client : public _http_client_communicator
             }
         }
 #endif
-		//Enable TLS 1.1 and 1.2
-        HRESULT result(S_OK);
+        //Enable TLS 1.1 and 1.2
         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()); }
+        if(FALSE == win32_result)
+        {
+            return report_failure(_XPLATSTR("Error setting session options"));
+        }
+
+        config._invoke_nativesessionhandle_options(m_hSession);
 
         // Register asynchronous callback.
         if(WINHTTP_INVALID_STATUS_CALLBACK == WinHttpSetStatusCallback(