Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'
authorJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)
* commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888':
  tls_gnutls: Readd support for nonblocking operation

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

@@@ -75,10 -61,8 +75,11 @@@ static int print_tls_error(URLContext *
  {
      switch (ret) {
      case GNUTLS_E_AGAIN:
+         return AVERROR(EAGAIN);
      case GNUTLS_E_INTERRUPTED:
 +#ifdef GNUTLS_E_PREMATURE_TERMINATION
 +    case GNUTLS_E_PREMATURE_TERMINATION:
 +#endif
          break;
      case GNUTLS_E_WARNING_ALERT_RECEIVED:
          av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));