mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 03:35:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Backport the implementation of vio_pending from 6.0-codebase.

Browse source 
Original changeset:
------------------------------------------------------------
revno: 2626
committer: davi@mysql.com/endora.local
timestamp: Wed 2008-04-23 09:33:25 -0300
message:
Fix for main.ssl and main.ssl_compress test case failures under pool-of-threads.

The problem is that the SSL layer has a read buffer and might read
more data than requested by the VIO layer. The SSL layer empties the
socket buffer which causes the socket to not be signaled for IO if
the client is waiting for a command which is sitting in the read
buffer.

The solution is to retrieve from the transport layer the number of
bytes waiting in the read buffer. The data in the read buffer needs
to be processed before waiting for more data.
This commit is contained in:
Konstantin Osipov 2009-11-21 02:12:23 +03:00
commit 6bdc288ff2
2 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/violite.h
View file

@ -86,6 +86,7 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port);
void vio_in_addr(Vio *vio, struct in_addr *in);
my_bool vio_poll_read(Vio *vio, uint timeout);
my_bool vio_is_connected(Vio *vio);
ssize_t vio_pending(Vio *vio);
#ifdef HAVE_OPENSSL
#include <openssl/opensslv.h>

24
vio/viosocket.c
View file

@ -855,3 +855,27 @@ int vio_close_shared_memory(Vio * vio)
}
#endif /* HAVE_SMEM */
#endif /* __WIN__ */
/**
Number of bytes in the read buffer.
@return number of bytes in the read buffer or < 0 if error.
*/
ssize_t vio_pending(Vio *vio)
{
#ifdef HAVE_OPENSSL
SSL *ssl= (SSL*) vio->ssl_arg;
#endif
if (vio->read_pos < vio->read_end)
return vio->read_end - vio->read_pos;
#ifdef HAVE_OPENSSL
if (ssl)
return SSL_pending(ssl);
#endif
return 0;
}