From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 28 Apr 2013 13:41:05 +0000 (+0200)
Subject: Automatically set HTTPS proxy if given (Fixes #805)
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=434aca5b143fe358ae46688196391307834168fa;p=youtube-dl.git

Automatically set HTTPS proxy if given (Fixes #805)
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index ce754ffd3..2639df818 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -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)