diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-09-28 22:30:59 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-09-28 22:30:59 +0000 |
| commit | 2dd882885b8d72941a706048c59fec3f84d7377f (patch) | |
| tree | 2be4c45bb376494964a31d4d9dfded348f3b3e2a | |
| parent | 632a424db77f8e194443307a8fdc5857db7bd63d (diff) | |
Fixed #5047: patch_cache_control now respects existing max-age settings. Thanks, permon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/utils/cache.py | 7 |
2 files changed, 8 insertions, 0 deletions
@@ -234,6 +234,7 @@ answer newbie questions, and generally made Django that much better: Jay Parlar <parlar@gmail.com> pavithran s <pavithran.s@gmail.com> Barry Pederson <bp@barryp.org> + permonik@mesias.brnonet.cz petr.marhoun@gmail.com pgross@thoughtworks.com phaedo <http://phaedo.cx/> diff --git a/django/utils/cache.py b/django/utils/cache.py index 2494d7839e..9cf436d798 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -57,6 +57,13 @@ def patch_cache_control(response, **kwargs): cc = dict([dictitem(el) for el in cc]) else: cc = {} + + # If there's already a max-age header but we're being asked to set a new + # max-age, use the minumum of the two ages. In practice this happens when + # a decorator and a piece of middleware both operate on a given view. + if 'max-age' in cc and 'max_age' in kwargs: + kwargs['max_age'] = min(cc['max-age'], kwargs['max_age']) + for (k,v) in kwargs.items(): cc[k.replace('_', '-')] = v cc = ', '.join([dictvalue(el) for el in cc.items()]) |