diff --git a/lib/yt_dlp/extractor/common.py b/lib/yt_dlp/extractor/common.py index e232aa883..a952828fb 100644 --- a/lib/yt_dlp/extractor/common.py +++ b/lib/yt_dlp/extractor/common.py @@ -1036,13 +1036,14 @@ def _webpage_read_content(self, urlh, url_or_request, video_id, note=None, errno webpage_bytes = urlh.read() if prefix is not None: webpage_bytes = prefix + webpage_bytes - url_or_request = self._create_request(url_or_request, data) if self.get_param('dump_intermediate_pages', False): self.to_screen('Dumping request to ' + urlh.url) dump = base64.b64encode(webpage_bytes).decode('ascii') self._downloader.to_screen(dump) if self.get_param('write_pages'): - filename = self._request_dump_filename(urlh.url, video_id, url_or_request.data) + if isinstance(url_or_request, Request): + data = self._create_request(url_or_request, data).data + filename = self._request_dump_filename(urlh.url, video_id, data) self.to_screen(f'Saving request to {filename}') with open(filename, 'wb') as outf: outf.write(webpage_bytes) diff --git a/lib/yt_dlp/networking/common.py b/lib/yt_dlp/networking/common.py index a2217034c..d473e16c5 100644 --- a/lib/yt_dlp/networking/common.py +++ b/lib/yt_dlp/networking/common.py @@ -31,6 +31,8 @@ ) from ..utils.networking import HTTPHeaderDict, normalize_url +DEFAULT_TIMEOUT = 20 + def register_preference(*handlers: type[RequestHandler]): assert all(issubclass(handler, RequestHandler) for handler in handlers) @@ -235,7 +237,7 @@ def __init__( self._logger = logger self.headers = headers or {} self.cookiejar = cookiejar if cookiejar is not None else YoutubeDLCookieJar() - self.timeout = float(timeout or 20) + self.timeout = float(timeout or DEFAULT_TIMEOUT) self.proxies = proxies or {} self.source_address = source_address self.verbose = verbose diff --git a/lib/yt_dlp_version b/lib/yt_dlp_version index 1d2f1da02..f15ff5e47 100644 --- a/lib/yt_dlp_version +++ b/lib/yt_dlp_version @@ -1 +1 @@ -12d8ea8246fa901de302ff5cc748caddadc82f41 \ No newline at end of file +53b4d44f55cca66ac33dab092ef2a30b1164b684 \ No newline at end of file