diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-11 13:18:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-11 13:18:52 -0300 |
| commit | f3881c04e93ee70567bd3fe087f49b996b026d30 (patch) | |
| tree | f2fab6d24384eea5bf35dc729009c48530596bbf | |
| parent | 03210fe138f3b3bd7f5272fe29aca810cf517329 (diff) | |
| parent | 6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978 (diff) | |
| download | ffmpeg-f3881c04e93ee70567bd3fe087f49b996b026d30.tar.gz | |
Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'
* commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978':
tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/tls_openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 59a86150a7..7ae71bdaf3 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -119,7 +119,7 @@ static int print_tls_error(URLContext *h, int ret) TLSContext *c = h->priv_data; if (h->flags & AVIO_FLAG_NONBLOCK) { 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); } av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); |