Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES/14064.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixed :class:`~aiohttp.CookieJar` keeping a cookie as a session cookie when its
``Expires`` attribute is ``Thu, 01 Jan 1970 00:00:00 GMT``, instead of deleting
it -- by :user:`spicysharkco`.
2 changes: 1 addition & 1 deletion aiohttp/cookiejar.py
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ def _update_cookies(
cookie["max-age"] = ""

elif expires := cookie["expires"]:
if expire_time := self._parse_date(expires):
if (expire_time := self._parse_date(expires)) is not None:
deadline = expire_time
else:
cookie["expires"] = ""
Expand Down
11 changes: 11 additions & 0 deletions tests/test_cookiejar.py
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,17 @@ async def test_cookie_jar_filter_cookies_expires() -> None:
assert len(jar) == 0


def test_cookie_jar_epoch_expires_deletes_cookie() -> None:
jar = CookieJar()
url = URL("https://example.com/")
jar.update_cookies_from_headers(["sid=old"], url)
jar.update_cookies_from_headers(
["sid=; Expires=Thu, 01 Jan 1970 00:00:00 GMT"], url
)

assert len(jar.filter_cookies(url)) == 0


async def test_cookie_jar_heap_cleanup() -> None:
"""Test that the heap gets cleaned up when there are many old expirations."""
jar = CookieJar()
Expand Down
Loading