From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 17 Sep 2020 20:32:54 +0000 (+0700)
Subject: [downloader/http] Improve timeout detection when reading block of data (refs #10935)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=cdc55e666f3f9c795ed74c478c6a249d992cf93f;hp=86b7c00adca578b36138b165b0add5978972917e

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

diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py
index e14ddce58..6ef26548d 100644
--- 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)