From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 25 Nov 2013 18:11:01 +0000 (+0100)
Subject: Reduce socket timeout
X-Git-Tag: 2013.11.25.3~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d46cc192d763f66655247ee122e397626481caca;p=youtube-dl.git

Reduce socket timeout
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index a1ef3a94ab..0cef1daf32 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -968,7 +968,7 @@ class YoutubeDL(object):
                 proxy_map.update(handler.proxies)
         write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
 
-    def _setup_opener(self, timeout=300):
+    def _setup_opener(self, timeout=20):
         opts_cookiefile = self.params.get('cookiefile')
         opts_proxy = self.params.get('proxy')