RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 18:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: ssl: Return -1 on recv/send if we got EAGAIN.

Browse Source 
In ha_ssl_read()/ha_ssl_write(), if we couldn't send/receive data because
we got EAGAIN, return -1 and not 0, as older SSL versions expect that.
This should fix the problems with OpenSSL < 1.1.0.
This commit is contained in:
Olivier Houchard 2019-04-24 12:04:36 +02:00 committed by Olivier Houchard
parent 371723b0c2
commit a28454ee21
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl_sock.c
View File

@ -271,8 +271,10 @@ static int ha_ssl_write(BIO *h, const char *buf, int num)
tmpbuf.data = num;
tmpbuf.head = 0;
ret = ctx->xprt->snd_buf(ctx->conn, ctx->xprt_ctx, &tmpbuf, num, 0);
if (ret == 0 && !(ctx->conn->flags & CO_FL_ERROR))
if (ret == 0 && !(ctx->conn->flags & CO_FL_ERROR)) {
BIO_set_retry_write(h);
ret = -1;
}
return ret;
}
@ -304,8 +306,10 @@ static int ha_ssl_read(BIO *h, char *buf, int size)
tmpbuf.data = 0;
tmpbuf.head = 0;
ret = ctx->xprt->rcv_buf(ctx->conn, ctx->xprt_ctx, &tmpbuf, size, 0);
if (ret == 0 && !(ctx->conn->flags & CO_FL_ERROR))
if (ret == 0 && !(ctx->conn->flags & CO_FL_ERROR)) {
BIO_set_retry_read(h);
ret = -1;
}
return ret;
}