SERVER-6656 prevent SSL memory leaks

If a BackgroundTask should attempt to use SSL (via an outbound connection),
this commit will now ensure the SSL thread-specific data is cleaned up on
thread exit.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/mongo/util/background.cpp b/src/mongo/util/background.cpp
index 4fca89b5310..bfdcde101ce 100644
--- a/src/mongo/util/background.cpp
+++ b/src/mongo/util/background.cpp
@@ -15,20 +15,21 @@
  *    limitations under the License.
  */
 
-#include "pch.h"
+#include "mongo/pch.h"
+
+#include "mongo/util/background.h"
 
 #include <boost/thread/condition.hpp>
 #include <boost/thread/thread.hpp>
 
-#include "concurrency/mutex.h"
-#include "concurrency/spin_lock.h"
-
-#include "background.h"
-#include "time_support.h"
-#include "timer.h"
-
-#include "mongoutils/str.h"
+#include "mongo/util/concurrency/mutex.h"
+#include "mongo/util/concurrency/spin_lock.h"
+#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/net/ssl_manager.h"
+#include "mongo/util/time_support.h"
+#include "mongo/util/timer.h"
 
+using namespace std;
 namespace mongo {
 
     // both the BackgroundJob and the internal thread point to JobStatus
@@ -76,6 +77,9 @@ namespace mongo {
             status->finished.notify_all();
         }
 
+#ifdef MONGO_SSL
+        SSLManager::cleanupThreadLocals();
+#endif
         if( status->deleteSelf )
             delete this;
     }