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 /extra | |
| 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 'extra')
| -rw-r--r-- | extra/yassl/src/ssl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 9516e8b985e..23465335922 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -1471,10 +1471,6 @@ int SSL_peek(SSL* ssl, void* buffer, int sz) int SSL_pending(SSL* ssl) { - // Just in case there's pending data that hasn't been processed yet... - char c; - SSL_peek(ssl, &c, 1); - return ssl->bufferedData(); } |