do
ret = SSL_read (conn, buf, bufsize);
while (ret == -1
- && (SSL_get_error (conn, ret) == SSL_ERROR_WANT_READ
|| (SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
- && errno == EINTR)));
+ && errno == EINTR));
return ret;
}
{
struct openssl_transport_context *ctx = arg;
SSL *conn = ctx->conn;
- if (timeout == 0)
- return 1;
if (SSL_pending (conn))
return 1;
+ if (timeout == 0)
+ return 1;
return select_fd (fd, timeout, wait_for);
}
int ret;
struct openssl_transport_context *ctx = arg;
SSL *conn = ctx->conn;
+ if (! openssl_poll (fd, 0.0, WAIT_FOR_READ, arg))
+ return 0;
do
ret = SSL_peek (conn, buf, bufsize);
while (ret == -1