diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /vio | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 74ad97809e2..c6f6dbd49c9 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -383,6 +383,10 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, yaSSL_transport_set_send_function(ssl, yassl_send); #endif +#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION) + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); +#endif + if ((r= ssl_handshake_loop(vio, ssl, func)) < 1) { DBUG_PRINT("error", ("SSL_connect/accept failure")); |