]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:18:52 +0000 (13:18 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:18:52 +0000 (13:18 -0300)
* commit '6a9c00c09d2bc50c0ea64ba092b2f4afc46aa978':
  tls_openssl: Fix checks for SSL_ERROR_WANT_WRITE in nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
libavformat/tls_openssl.c

index 59a86150a793dbc18c34f56578f6839c8fd7fb1a..7ae71bdaf36d7ab01cefa15136cb2d370a70aecd 100644 (file)
@@ -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));