aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-08-27 23:31:24 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-08-27 23:31:24 +0200
commit88a79ce6a6edb6d3f8b6e3319f6ca1d3d2954c16 (patch)
tree01e08a9bff6122159c044d5e53809f2d2cf73daf
parentacebc9cd6bd713c518e80d00af13e3120614e115 (diff)
downloadyoutube-dl-88a79ce6a6edb6d3f8b6e3319f6ca1d3d2954c16.tar.xz
Delete default user agent (Fixes #1309)
-rw-r--r--youtube_dl/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 614429073..bc6a6d180 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -430,6 +430,10 @@ def _real_main(argv=None):
proxy_handler = compat_urllib_request.ProxyHandler(proxies)
https_handler = make_HTTPS_handler(opts)
opener = compat_urllib_request.build_opener(https_handler, proxy_handler, cookie_processor, YoutubeDLHandler())
+ # Delete the default user-agent header, which would otherwise apply in
+ # cases where our custom HTTP handler doesn't come into play
+ # (See https://github.com/rg3/youtube-dl/issues/1309 for details)
+ opener.addheaders =[]
compat_urllib_request.install_opener(opener)
socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)