diff options
| author | Dwight Gunning <dwight@dwightgunning.com> | 2015-11-07 16:26:38 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-09 14:26:29 -0500 |
| commit | 1f29164ced01bde92c72d20d67bc453484a4f078 (patch) | |
| tree | 0ad75f315d96530ff935ccf991d6c218308f6657 | |
| parent | 1155843a41af589a856efe8e671a796866430049 (diff) | |
Fixed #6727 -- Made patch_cache_control() patch an empty Cache-Control header.
| -rw-r--r-- | django/utils/cache.py | 2 | ||||
| -rw-r--r-- | tests/cache/tests.py | 1 |
2 files changed, 2 insertions, 1 deletions
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'}), |
