Ticket #16035: patch_for_16035.diff

django/middleware/gzip.py

@@ -37 +37 @@
         if len(compressed_content) >= len(response.content):
             return response
 
+        if response.has_header('ETag'):  
+            response['ETag'] = re.sub('"$', ';gzip"', response['ETag']) 
+
         response.content = compressed_content
         response['Content-Encoding'] = 'gzip'
         response['Content-Length'] = str(len(response.content))

tests/regressiontests/middleware/tests.py

@@ -14 +14 @@
 from django.middleware.http import ConditionalGetMiddleware
 from django.middleware.gzip import GZipMiddleware
 from django.test import TestCase
-
+from django.test.utils import override_settings
 
 class CommonMiddlewareTest(TestCase):
     def setUp(self):
@@ -582 +582 @@
         r = GZipMiddleware().process_response(self.req, self.resp)
         self.assertEqual(r.content, self.uncompressible_string)
         self.assertEqual(r.get('Content-Encoding'), None)
+
+
+@override_settings(USE_ETAGS=True)
+class ETagGZipMiddlewareTest(TestCase):
+    """
+    Tests if the ETag middleware behaves correctly with GZip middleware.
+    """
+    compressible_string = 'a' * 500
+
+    def _get_request(self):
+        req = HttpRequest()
+        req.META = {
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': 80,
+        }
+        req.path = req.path_info = "/"
+        req.META['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate'
+        req.META['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Windows NT 5.1; rv:9.0.1) Gecko/20100101 Firefox/9.0.1'
+        return req
+
+    def _get_response(self):
+        resp = HttpResponse()
+        resp.status_code = 200
+        resp.content = self.compressible_string
+        resp['Content-Type'] = 'text/html; charset=UTF-8'
+        return resp
+
+    def test_compress_response(self):
+        """
+        Tests that ETag is changed after gzip compression is performed.
+        """
+        req = self._get_request()
+        resp = self._get_response()
+        r = GZipMiddleware().process_response(req, 
+                CommonMiddleware().process_response(req, resp))
+        gzip_etag = r.get('ETag')
+
+        req = self._get_request()
+        req.META['HTTP_ACCEPT_ENCODING'] = ''
+        resp = self._get_response()
+        r = GZipMiddleware().process_response(req, 
+                CommonMiddleware().process_response(req, resp))
+        nogzip_etag = r.get('ETag')
+
+        self.assertNotEqual(gzip_etag, nogzip_etag)