diff options
| author | Eric Milkie <milkie@10gen.com> | 2012-12-11 15:51:23 -0500 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-12-11 15:51:59 -0500 |
| commit | 21e5ca09c42ec7ae7e1efe10f37e21082a5e9c15 (patch) | |
| tree | ffb3d5af0e55bd98c101e9e0d0e8a09f25b711c5 /src/mongo/util/net/httpclient.cpp | |
| parent | 1dfaa36f44989f41eadc1b7d8e108ca105be3a55 (diff) | |
| download | mongo-21e5ca09c42ec7ae7e1efe10f37e21082a5e9c15.tar.gz | |
SERVER-7202 cleanup SSLManager management
Rather than a single global Manager,
we now have one per Listener on the server, plus a global for client use
that is mutex-protected.
Diffstat (limited to 'src/mongo/util/net/httpclient.cpp')
| -rw-r--r-- | src/mongo/util/net/httpclient.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/util/net/httpclient.cpp b/src/mongo/util/net/httpclient.cpp index ea2880f34a8..a77bfccf3cd 100644 --- a/src/mongo/util/net/httpclient.cpp +++ b/src/mongo/util/net/httpclient.cpp @@ -102,7 +102,12 @@ namespace mongo { if ( ssl ) { #ifdef MONGO_SSL - sock.secure(SSLManager::getGlobal()); + // never deleted + SSLManager* mgr = new SSLManager(cmdLine.sslPEMKeyFile, + cmdLine.sslPEMKeyPassword, + cmdLine.sslCAFile); + + sock.secure(mgr); #else uasserted( 15862 , "no ssl support" ); #endif |