From: aegamesi <admin.aegamesi@gmail.com>
Date: Sun, 30 Apr 2017 05:56:33 +0000 (-0700)
Subject: [YoutubeDL] Recognize expires=0 as session cookies and send session cookies with... 
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=1d88b3e6e6e59e4b52305faf6c1bf1fd69c555ee;p=youtube-dl

[YoutubeDL] Recognize expires=0 as session cookies and send session cookies with requests
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 38ba43a97..2433f74f4 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -2300,7 +2300,13 @@ class YoutubeDL(object):
             self.cookiejar = compat_cookiejar.MozillaCookieJar(
                 opts_cookiefile)
             if os.access(opts_cookiefile, os.R_OK):
-                self.cookiejar.load()
+                self.cookiejar.load(ignore_discard=True, ignore_expires=True)
+                # Force CookieJar to treat 'expires=0' cookies as session/discard cookies
+                # Fixes https://bugs.python.org/issue17164
+                for cookie in self.cookiejar:
+                    if cookie.expires == 0:
+                        cookie.expires = None
+                        cookie.discard = True
 
         cookie_processor = YoutubeDLCookieProcessor(self.cookiejar)
         if opts_proxy is not None: