From 1f29164ced01bde92c72d20d67bc453484a4f078 Mon Sep 17 00:00:00 2001 From: Dwight Gunning Date: Sat, 7 Nov 2015 16:26:38 +0100 Subject: [PATCH] Fixed #6727 -- Made patch_cache_control() patch an empty Cache-Control header. --- django/utils/cache.py | 2 +- tests/cache/tests.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/django/utils/cache.py b/django/utils/cache.py index c8ab96fe3d..eb3aa631ec 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -63,7 +63,7 @@ def patch_cache_control(response, **kwargs): else: return '%s=%s' % (t[0], t[1]) - if response.has_header('Cache-Control'): + if response.get('Cache-Control'): cc = cc_delim_re.split(response['Cache-Control']) cc = dict(dictitem(el) for el in cc) else: diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 066ffad3e2..ba3745847b 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1456,6 +1456,7 @@ class CacheUtils(SimpleTestCase): tests = ( # Initial Cache-Control, kwargs to patch_cache_control, expected Cache-Control parts (None, {'private': True}, {'private'}), + ('', {'private': True}, {'private'}), # Test whether private/public attributes are mutually exclusive ('private', {'private': True}, {'private'}),