From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 13 Nov 2016 15:28:29 +0000 (+0700)
Subject: [nrk] Add X-Forwarded-For HTTP header in info dict
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=7e08e2cab02b0284e72171b3ba6b946b49f12331;p=youtube-dl

[nrk] Add X-Forwarded-For HTTP header in info dict
---

diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index aed98141b..1f2204833 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -17,14 +17,15 @@ from ..utils import (
 class NRKBaseIE(InfoExtractor):
     _faked_ip = None
 
-    def _download_webpage(self, *args, **kwargs):
+    def _download_webpage_handle(self, *args, **kwargs):
         # NRK checks X-Forwarded-For HTTP header in order to figure out the
         # origin of the client behind proxy. This allows to bypass geo
         # restriction by faking this header's value to some Norway IP.
         # We will do so once we encounter any geo restriction error.
         if self._faked_ip:
-            kwargs.setdefault('headers', {})['X-Forwarded-For'] = self._faked_ip
-        return super(NRKBaseIE, self)._download_webpage(*args, **kwargs)
+            # NB: str is intentional
+            kwargs.setdefault(str('headers'), {})['X-Forwarded-For'] = self._faked_ip
+        return super(NRKBaseIE, self)._download_webpage_handle(*args, **kwargs)
 
     def _fake_ip(self):
         # Use fake IP from 37.191.128.0/17 in order to workaround geo
@@ -43,6 +44,8 @@ class NRKBaseIE(InfoExtractor):
         title = data.get('fullTitle') or data.get('mainTitle') or data['title']
         video_id = data.get('id') or video_id
 
+        http_headers = {'X-Forwarded-For': self._faked_ip} if self._faked_ip else {}
+
         entries = []
 
         media_assets = data.get('mediaAssets')
@@ -73,6 +76,7 @@ class NRKBaseIE(InfoExtractor):
                     'duration': duration,
                     'subtitles': subtitles,
                     'formats': formats,
+                    'http_headers': http_headers,
                 })
 
         if not entries: