hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed SSL_ERROR_WANT_READ, SSL_ERROR_WANT_WRITE and SSL_ERROR_NONE causing a debug assert.

Browse Source
This commit is contained in:
Markus Makela 2015-06-05 20:36:04 +03:00
parent 1989a1482c
commit d19ccc6f84
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/dcb.c
View File

@ -1002,13 +1002,21 @@ int dcb_read_SSL(
if (n < 0)
{
char errbuf[200];
ssl_errno = SSL_get_error(dcb->ssl,n);
if(ssl_errno != SSL_ERROR_WANT_READ &&
ssl_errno != SSL_ERROR_WANT_WRITE &&
ssl_errno != SSL_ERROR_NONE)
#ifdef SS_DEBUG
ERR_error_string(ssl_errno,errbuf);
skygw_log_write_flush(LD,"[%lu]SSL error %d: %s",
pthread_self(),ssl_errno,errbuf);
#endif
if(ssl_errno == SSL_ERROR_WANT_READ ||
ssl_errno == SSL_ERROR_WANT_WRITE ||
ssl_errno == SSL_ERROR_NONE)
{
n = 0;
}
else
{
char errbuf[200];
ERR_error_string(ssl_errno,errbuf);
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
@ -1019,10 +1027,10 @@ int dcb_read_SSL(
dcb->fd,
ssl_errno,
errbuf)));
gwbuf_free(buffer);
goto return_n;
}
gwbuf_free(buffer);
goto return_n;
}
else if(n == 0)
{