youtube-dl

commit: cdc55e666f3f9c795ed74c478c6a249d992cf93f
parent 86b7c00adca578b36138b165b0add5978972917e
Author: Sergey M․ <dstftw@gmail.com>
Date:   Fri, 18 Sep 2020 03:32:54 +0700

[downloader/http] Improve timeout detection when reading block of data (refs #10935)

Diffstat:
M
youtube_dl/downloader/http.py
8
+++++---

1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py
@@ -238,9 +238,11 @@ class HttpFD(FileDownloader):
                 except socket.timeout as e:
                     retry(e)
                 except socket.error as e:
-                    if e.errno not in (errno.ECONNRESET, errno.ETIMEDOUT):
-                        raise
-                    retry(e)
+                    # SSLError on python 2 (inherits socket.error) may have
+                    # no errno set but this error message
+                    if e.errno in (errno.ECONNRESET, errno.ETIMEDOUT) or getattr(e, 'message') == 'The read operation timed out':
+                        retry(e)
+                    raise
 
                 byte_counter += len(data_block)