Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 16 Sep 2014 21:35:08 +0000 (23:35 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 16 Sep 2014 21:35:08 +0000 (23:35 +0200)
youtube_dl/extractor/generic.py

index 2bfa20606cd7846b0d15e8c441de3fce2a8982f6..40eeaad16d42acf089d1d426a055d4e5ce5624cf 100644 (file)
@@ -877,7 +877,7 @@ class GenericIE(InfoExtractor):
         if not found:
             found = re.search(
                 r'(?i)<meta\s+(?=(?:[a-z-]+="[^"]+"\s+)*http-equiv="refresh")'
-                r'(?:[a-z-]+="[^"]+"\s+)*?content="[0-9]{,2};url=\'([^\']+)\'"',
+                r'(?:[a-z-]+="[^"]+"\s+)*?content="[0-9]{,2};url=\'?([^\'"]+)',
                 webpage)
             if found:
                 new_url = found.group(1)