Ticket #14103: cache_honor_use_etags.diff

django/conf/global_settings.py

@@ -430 +430 @@
 CACHE_BACKEND = 'locmem://'
 CACHE_MIDDLEWARE_KEY_PREFIX = ''
 CACHE_MIDDLEWARE_SECONDS = 600
+CACHE_MIDDLEWARE_USE_ETAGS = None
 
 ####################
 # COMMENTS         #

django/utils/cache.py

@@ -101 +101 @@
         cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
     if cache_timeout < 0:
         cache_timeout = 0 # Can't have max-age negative
-    if not response.has_header('ETag'):
+    if (settings.CACHE_MIDDLEWARE_USE_ETAGS==None and settings.USE_ETAGS or \
+        settings.CACHE_MIDDLEWARE_USE_ETAGS) and not response.has_header('ETag'):
         response['ETag'] = '"%s"' % md5_constructor(response.content).hexdigest()
     if not response.has_header('Last-Modified'):
         response['Last-Modified'] = http_date()