Merge 00c7c68bf7 into d65d89183f

youtube_dl/__init__.py

@@ -405,6 +405,7 @@ def _real_main(argv=None):
         'prefer_ffmpeg': opts.prefer_ffmpeg,
         'include_ads': opts.include_ads,
         'default_search': opts.default_search,
+        'skip_http_head': opts.generic_skip_http_head,
         'youtube_include_dash_manifest': opts.youtube_include_dash_manifest,
         'encoding': opts.encoding,
         'extract_flat': opts.extract_flat,

youtube_dl/extractor/generic.py

@@ -2289,13 +2289,15 @@ class GenericIE(InfoExtractor):
         else:
             video_id = self._generic_id(url)
 
-        self.to_screen('%s: Requesting header' % video_id)
-
-        head_req = HEADRequest(url)
-        head_response = self._request_webpage(
-            head_req, video_id,
-            note=False, errnote='Could not send HEAD request to %s' % url,
-            fatal=False)
+        if self._downloader.params.get('skip_http_head') == None:
+            head_response = False
+        else:
+            self.to_screen('%s: Requesting header' % video_id)
+            head_req = HEADRequest(url)
+            head_response = self._request_webpage(
+                head_req, video_id,
+                note=False, errnote='Could not send HEAD request to %s' % url,
+                fatal=False)
 
         if head_response is not False:
             # Check for redirect

youtube_dl/options.py

@@ -198,6 +198,11 @@ def parseOpts(overrideArguments=None):
         action='store_true', dest='no_color',
         default=False,
         help='Do not emit color codes in output')
+    general.add_option(
+        '--skip-http-head',
+        action='store_const', default=False, dest='generic_skip_http_head',
+        help='Skip the initial HTTP head request',
+    )
 
     network = optparse.OptionGroup(parser, 'Network Options')
     network.add_option(