CXX-338 Backport server r2.6.4..r2.6.5 changes

Author: acmorrow

src/mongo/util/net/sock.cpp

@@ -437,15 +437,6 @@ namespace mongo {
 
     void Socket::close() {
         if ( _fd >= 0 ) {
-#ifdef MONGO_SSL
-            if (_sslConnection.get()) {
-                try {
-                    _sslManager->SSL_shutdown( _sslConnection.get() );
-                }
-                catch (const SocketException&) { // SSL_shutdown may throw if the connection fails
-                }  
-            }
-#endif
             // Stop any blocking reads/writes, and prevent new reads/writes
 #if defined(_WIN32)
             shutdown( _fd, SD_BOTH );

src/mongo/util/version.cpp

@@ -31,7 +31,7 @@ namespace mongo {
      *      1.2.3-rc4-pre-
      * If you really need to do something else you'll need to fix _versionArray()
      */
-    const char versionString[] = "2.6.4";
+    const char versionString[] = "2.6.5";
 
     // See unit test for example outputs
     BSONArray toVersionArray(const char* version){