Ticket #5047: max_age.diff

django/utils/cache.py

@@ -57 +57 @@
         cc = dict([dictitem(el) for el in cc])
     else:
         cc = {}
+
+    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()])