diff options
| author | Harin Vadodaria <harin.vadodaria@oracle.com> | 2013-02-19 12:19:10 +0530 |
|---|---|---|
| committer | Harin Vadodaria <harin.vadodaria@oracle.com> | 2013-02-19 12:19:10 +0530 |
| commit | cc85d62c6852a455831932493313ba8d6b0b282a (patch) | |
| tree | b33d0ad732f0046545b3a2627d1323b03c078090 /vio/viossl.c | |
| parent | 9a989c57de8e009d4c488246af8705f10d4199f5 (diff) | |
| parent | c40136542310982fd365e53f927b5a929f564b3e (diff) | |
| download | mariadb-git-cc85d62c6852a455831932493313ba8d6b0b282a.tar.gz | |
Bug#16235681: TURN OFF DEFAULT COMPRESSION WHILE USING
OPENSSL
Description: Merge from 5.1.
Diffstat (limited to 'vio/viossl.c')
| -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 e7ab7e4c6d1..f3da12b50c5 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -171,6 +171,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); +#ifndef HAVE_YASSL + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); +#endif if ((r= connect_accept_func(ssl)) < 1) { |