Commit f3881c04 authored by James Almer's avatar James Almer

Merge commit '6a9c00c0'

* commit '6a9c00c0':
  tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 03210fe1 6a9c00c0
...@@ -119,7 +119,7 @@ static int print_tls_error(URLContext *h, int ret) ...@@ -119,7 +119,7 @@ static int print_tls_error(URLContext *h, int ret)
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
if (h->flags & AVIO_FLAG_NONBLOCK) { if (h->flags & AVIO_FLAG_NONBLOCK) {
int err = SSL_get_error(c->ssl, ret); int err = SSL_get_error(c->ssl, ret);
if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_READ) if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
} }
av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment