Changeset 6434

Timestamp:

09/28/07 17:30:59 (1 year ago)

Author:

jacob

Message:

Fixed #5047: patch_cache_control now respects existing max-age settings. Thanks, permon.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/utils/cache.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -235 +235 @@
-    pavithran s <pavithran.s@gmail.com>
-    Barry Pederson <bp@barryp.org>
+    permonik@mesias.brnonet.cz
-    petr.marhoun@gmail.com
-    pgross@thoughtworks.com

django/trunk/django/utils/cache.py

@@ -58 +58 @@
-    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