From 1bf5423e82d17ebaa496865cfcfa845b4257e13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Wed, 10 Sep 2014 18:29:20 +0700
Subject: [generic/youtube] Recognize youtube nocookie embeds (Closes #3713)

---
 youtube_dl/extractor/generic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'youtube_dl/extractor/generic.py')

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 1b7697870..2bfa20606 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -628,7 +628,7 @@ class GenericIE(InfoExtractor):
                 embedSWF\(?:\s*
             )
             (["\'])
-                (?P<url>(?:https?:)?//(?:www\.)?youtube\.com/
+                (?P<url>(?:https?:)?//(?:www\.)?youtube(?:-nocookie)?\.com/
                 (?:embed|v)/.+?)
             \1''', webpage)
         if matches:
-- 
cgit v1.2.3


From a04aa7a9e692b174f4b03ddf6918c2d0a20ff7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
 <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 16 Sep 2014 22:53:48 +0200
Subject: [generic] The url in the <meta redirect> doesn't need to be enclosed
 in single quotes (fixes #3770)

See the examples in https://en.wikipedia.org/wiki/Meta_refresh or the shortened urls from https://t.co/.
---
 youtube_dl/extractor/generic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'youtube_dl/extractor/generic.py')

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 2bfa20606..40eeaad16 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -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)
-- 
cgit v1.2.3