mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-24 17:25:52 +01:00
[downloader/http] Fix 302 infinite loops by not reusing requests
This commit is contained in:
parent
b54d4a5ce8
commit
cf7259bc93
@ -42,8 +42,6 @@ class HttpFD(FileDownloader):
|
|||||||
add_headers = info_dict.get('http_headers')
|
add_headers = info_dict.get('http_headers')
|
||||||
if add_headers:
|
if add_headers:
|
||||||
headers.update(add_headers)
|
headers.update(add_headers)
|
||||||
basic_request = sanitized_Request(url, None, headers)
|
|
||||||
request = sanitized_Request(url, None, headers)
|
|
||||||
|
|
||||||
is_test = self.params.get('test', False)
|
is_test = self.params.get('test', False)
|
||||||
chunk_size = self._TEST_FILE_SIZE if is_test else (
|
chunk_size = self._TEST_FILE_SIZE if is_test else (
|
||||||
@ -98,6 +96,7 @@ class HttpFD(FileDownloader):
|
|||||||
range_end = ctx.data_len - 1
|
range_end = ctx.data_len - 1
|
||||||
has_range = range_start is not None
|
has_range = range_start is not None
|
||||||
ctx.has_range = has_range
|
ctx.has_range = has_range
|
||||||
|
request = sanitized_Request(url, None, headers)
|
||||||
if has_range:
|
if has_range:
|
||||||
set_range(request, range_start, range_end)
|
set_range(request, range_start, range_end)
|
||||||
# Establish connection
|
# Establish connection
|
||||||
@ -140,7 +139,8 @@ class HttpFD(FileDownloader):
|
|||||||
# Unable to resume (requested range not satisfiable)
|
# Unable to resume (requested range not satisfiable)
|
||||||
try:
|
try:
|
||||||
# Open the connection again without the range header
|
# Open the connection again without the range header
|
||||||
ctx.data = self.ydl.urlopen(basic_request)
|
ctx.data = self.ydl.urlopen(
|
||||||
|
sanitized_Request(url, None, headers))
|
||||||
content_length = ctx.data.info()['Content-Length']
|
content_length = ctx.data.info()['Content-Length']
|
||||||
except (compat_urllib_error.HTTPError, ) as err:
|
except (compat_urllib_error.HTTPError, ) as err:
|
||||||
if err.code < 500 or err.code >= 600:
|
if err.code < 500 or err.code >= 600:
|
||||||
@ -171,12 +171,6 @@ class HttpFD(FileDownloader):
|
|||||||
ctx.resume_len = 0
|
ctx.resume_len = 0
|
||||||
ctx.open_mode = 'wb'
|
ctx.open_mode = 'wb'
|
||||||
return
|
return
|
||||||
elif err.code == 302:
|
|
||||||
if not chunk_size:
|
|
||||||
raise
|
|
||||||
# HTTP Error 302: The HTTP server returned a redirect error that would lead to an infinite loop.
|
|
||||||
# may happen during chunk downloading. This is usually fixed
|
|
||||||
# with a retry.
|
|
||||||
elif err.code < 500 or err.code >= 600:
|
elif err.code < 500 or err.code >= 600:
|
||||||
# Unexpected HTTP error
|
# Unexpected HTTP error
|
||||||
raise
|
raise
|
||||||
|
Loading…
Reference in New Issue
Block a user