Merge branch 'mysql-5.7' into mysql-8.0

dragonly · Mar 1, 2019 · e070f8c · e070f8c
2 parents 750a084 + d433f6a
commit e070f8c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/vio/viossl.cc b/vio/viossl.cc
@@ -497,9 +497,6 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
     SSL_clear(ssl);
     SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
     SSL_set_fd(ssl, sd);
-#if !defined(HAVE_WOLFSSL) && OPENSSL_VERSION_NUMBER > 0x00908000L
-    SSL_clear_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT);
-#endif
 #if !defined(HAVE_WOLFSSL) && defined(SSL_OP_NO_COMPRESSION)
     SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
 #elif !defined(HAVE_WOLFSSL) && \