From: Martin Storsjö <martin@martin.st>
Date: Sat, 21 Sep 2013 22:02:36 +0000 (+0300)
Subject: tls: Do not abort on non-fatal TLS alerts with gnutls
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=5055035670bd1a1eaca64bd3bc71fb07de9df2c3;p=ffmpeg

tls: Do not abort on non-fatal TLS alerts with gnutls

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/tls.c b/libavformat/tls.c
index fecf096b021..7fa6fc2caeb 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -72,7 +72,14 @@ static int do_tls_poll(URLContext *h, int ret)
     TLSContext *c = h->priv_data;
     struct pollfd p = { c->fd, 0, 0 };
 #if CONFIG_GNUTLS
-    if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) {
+    switch (ret) {
+    case GNUTLS_E_AGAIN:
+    case GNUTLS_E_INTERRUPTED:
+        break;
+    case GNUTLS_E_WARNING_ALERT_RECEIVED:
+        av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));
+        break;
+    default:
         av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
         return AVERROR(EIO);
     }