diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-20 19:03:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 19:03:59 +0200 |
| commit | 2a45fa900b5916e9b789b1a4052ffd7c724f4166 (patch) | |
| tree | 8bd5e804c2baca4463ff417c644314ee6cca6f3a /mysql-test/t/ssl_timeout-9836.test | |
| parent | 0c0a865fad6c59b141892bfcb5be2dc2c11ae1a7 (diff) | |
| download | mariadb-git-2a45fa900b5916e9b789b1a4052ffd7c724f4166.tar.gz | |
MDEV-9836 Connection lost when using SSL
Don't read from socket in yassl in SSL_pending().
Just return size of the buffered processed data.
This is what OpenSSL is documented to do too:
SSL_pending() returns the number of bytes which have been processed,
buffered and are available inside ssl for immediate read.
Diffstat (limited to 'mysql-test/t/ssl_timeout-9836.test')
| -rw-r--r-- | mysql-test/t/ssl_timeout-9836.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/ssl_timeout-9836.test b/mysql-test/t/ssl_timeout-9836.test new file mode 100644 index 00000000000..5b57917f3b8 --- /dev/null +++ b/mysql-test/t/ssl_timeout-9836.test @@ -0,0 +1,11 @@ +# +# MDEV-9836 Connection lost when using SSL +# +-- source include/have_ssl_communication.inc +connect(con1,localhost,root,,,,,SSL); +SET @@net_read_timeout=1; +SELECT 1; +# MDEV-9836 - YASSL bug - SSL connection lost if it has been idle, for longer than net_read_timeout +-- sleep 2 +SELECT 1; +disconnect con1; |