diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 17:51:28 +0200 |
| commit | 4749d40c635634e25e07d28ce1a04e9263bcc375 (patch) | |
| tree | c5bb3287675cd8676d76c8ee42ef2d79cc599e25 /vio | |
| parent | 1ff1cb10fc236010b5969058cab934c2b306c931 (diff) | |
| parent | 33ef993773449cb3917665b188f6b6575d399bd0 (diff) | |
| download | mariadb-git-4749d40c635634e25e07d28ce1a04e9263bcc375.tar.gz | |
5.5 merge
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 48881cc2903..ad20a6ab5c3 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -183,6 +183,9 @@ 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, vio->sd); +#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION) + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); +#endif if ((r= connect_accept_func(ssl)) < 1) { |