ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Sep 11 13:18:52 2018 -0300| [f3881c04e93ee70567bd3fe087f49b996b026d30] | committer: James Almer
Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978' * commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978': tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3881c04e93ee70567bd3fe087f49b996b026d30 --- libavformat/tls_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog