summaryrefslogtreecommitdiff
path: root/src/third_party
diff options
context:
space:
mode:
authorAdam Midvidy <amidvidy@gmail.com>2015-07-22 11:26:14 -0400
committerAdam Midvidy <amidvidy@gmail.com>2015-07-22 16:23:36 -0400
commit3b08961d77a2a7b3a8a99594565dd60ea889877f (patch)
tree266d3331da3fa44d88f3ccb82ea2033e843df863 /src/third_party
parent56fb75b4c9f110ae36643234f8f4388d37fdde19 (diff)
downloadmongo-3b08961d77a2a7b3a8a99594565dd60ea889877f.tar.gz
SERVER-19221 patch ASIO to not initialize OpenSSL
Diffstat (limited to 'src/third_party')
-rw-r--r--src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp b/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
index 2bf2e0aa800..d7a9e1cdca5 100644
--- a/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
+++ b/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
@@ -741,8 +741,10 @@ private:
// The underlying native implementation.
native_handle_type handle_;
+ // MONGO HACK - prevent ASIO from initializing OpenSSL
// Ensure openssl is initialised.
- asio::ssl::detail::openssl_init<> init_;
+ // asio::ssl::detail::openssl_init<> init_;
+
};
} // namespace ssl