SERVER-5487 do not call SSL_shutdown on an SSL context while another thread is using it

2 files changed, 12 insertions, 10 deletions

diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index baaa13fbb2d..25a97e8029e 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -502,6 +502,17 @@ namespace mongo {
         _timeout = timeout;
         _init();
     }
+
+    Socket::~Socket() {
+        close();
+#ifdef MONGO_SSL
+        if ( _ssl ) {
+            SSL_shutdown( _ssl );
+            SSL_free( _ssl );
+            _ssl = 0;
+        }
+#endif
+    }
     
     void Socket::_init() {
         _bytesOut = 0;
@@ -513,13 +524,6 @@ namespace mongo {
     }
 
     void Socket::close() {
-#ifdef MONGO_SSL
-        if ( _ssl ) {
-            SSL_shutdown( _ssl );
-            SSL_free( _ssl );
-            _ssl = 0;
-        }
-#endif
         if ( _fd >= 0 ) {
             closesocket( _fd );
             _fd = -1;
diff --git a/src/mongo/util/net/sock.h b/src/mongo/util/net/sock.h
index 436998e7a09..b9963e09f69 100644
--- a/src/mongo/util/net/sock.h
+++ b/src/mongo/util/net/sock.h
@@ -204,9 +204,7 @@ namespace mongo {
         */
         Socket(double so_timeout = 0, int logLevel = 0 );
 
-        ~Socket() {
-            close();
-        }
+        ~Socket();
 
         bool connect(SockAddr& farEnd);
         void close();