Ticket #7228: 7228.diff

django_src/django/middleware/common.py

@@ -108 +108 @@
             if response.has_header('ETag'):
                 etag = response['ETag']
             else:
-                etag = md5.new(response.content).hexdigest()
+                etag = '"%s"' % md5.new(response.content).hexdigest() 
             if response.status_code >= 200 and response.status_code < 300 and request.META.get('HTTP_IF_NONE_MATCH') == etag:
                 cookies = response.cookies
                 response = http.HttpResponseNotModified()

django_src/django/utils/cache.py

@@ -104 +104 @@
     if cache_timeout < 0:
         cache_timeout = 0 # Can't have max-age negative
     if not response.has_header('ETag'):
-        response['ETag'] = md5.new(response.content).hexdigest()
+        response['ETag'] = '"%s"' % md5.new(response.content).hexdigest() 
     if not response.has_header('Last-Modified'):
         response['Last-Modified'] = http_date()
     if not response.has_header('Expires'):