Skip to content

Commit 283ec85

Browse files
committed
Merge branch 'dev/roschuma/host_based_connection_pool' into development
2 parents bdb3db6 + 08f5900 commit 283ec85

File tree

3 files changed

+252
-109
lines changed

3 files changed

+252
-109
lines changed

Release/include/cpprest/details/http_server_asio.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ class connection
8787
if (is_https)
8888
{
8989
m_ssl_context = utility::details::make_unique<boost::asio::ssl::context>(boost::asio::ssl::context::sslv23);
90-
ssl_context_callback(*m_ssl_context);
90+
if (ssl_context_callback)
91+
{
92+
ssl_context_callback(*m_ssl_context);
93+
}
9194
m_ssl_stream = utility::details::make_unique<boost::asio::ssl::stream<boost::asio::ip::tcp::socket&>>(*m_socket, *m_ssl_context);
9295

9396
m_ssl_stream->async_handshake(boost::asio::ssl::stream_base::server, [this](const boost::system::error_code&) { this->start_request_response(); });

Release/include/cpprest/http_client.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class http_client_config
100100
#endif
101101
, m_set_user_nativehandle_options([](native_handle)->void{})
102102
#if !defined(_WIN32) && !defined(__cplusplus_winrt)
103-
, m_ssl_context_callback([](boost::asio::ssl::context&)->void{})
104103
, m_tlsext_sni_enabled(true)
105104
#endif
106105
#if defined(_WIN32) && !defined(__cplusplus_winrt)

0 commit comments

Comments
 (0)