mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-10-31 14:45:26 +00:00
Automatically set HTTPS proxy if given (Fixes #805)
This commit is contained in:
parent
e31852aba9
commit
434aca5b14
1 changed files with 5 additions and 1 deletions
|
@ -376,7 +376,11 @@ def _real_main(argv=None):
|
|||
|
||||
# General configuration
|
||||
cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
|
||||
proxy_handler = compat_urllib_request.ProxyHandler()
|
||||
proxies = compat_urllib_request.getproxies()
|
||||
# Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805)
|
||||
if 'http' in proxies and 'https' not in proxies:
|
||||
proxies['https'] = proxies['http']
|
||||
proxy_handler = compat_urllib_request.ProxyHandler(proxies)
|
||||
opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
|
||||
compat_urllib_request.install_opener(opener)
|
||||
socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
|
||||
|
|
Loading…
Reference in a new issue