Changeset 1797

Timestamp:

10/28/07 13:33:34

Author:

fumanchu

Message:

Forward port to trunk from 3.0.x [1704]. Responses were being gzipped twice when served from cache.

Files:

• trunk/cherrypy/lib/encoding.py (modified) (1 diff)
• trunk/cherrypy/test/test_caching.py (modified) (1 diff)

trunk/cherrypy/lib/encoding.py

@@ -197 +197 @@
-    yield struct.pack("<L", size & 0xFFFFFFFFL)
-
+def decompress(body):
+    import gzip, StringIO
+    
+    zbuf = StringIO.StringIO()
+    zbuf.write(body)
+    zbuf.seek(0)
+    zfile = gzip.GzipFile(mode='rb', fileobj=zbuf)
+    data = zfile.read()
+    zfile.close()
+    return data
+
+
-def gzip(compress_level=9, mime_types=['text/html', 'text/plain']):
-    response = cherrypy.response
-    if not response.body:
-        # Response body is empty (might be a 304 for instance)
+        return
+    
+    # If returning cached content (which should already have been gzipped),
+    # don't re-zip.
+    if getattr(cherrypy.request, "cached", False):
-        return
-    

trunk/cherrypy/test/test_caching.py

@@ -106 +106 @@
-        # The previous request should have invalidated the cache,
-        # so this request will recalc the response.
-        zbuf = StringIO.StringIO()
-        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=9)
-        zfile.write("visit #5")
-        zfile.close()
-        
-        self.getPage("/", method="GET", headers=[('Accept-Encoding', 'gzip')])
-        self.assertHeader('Content-Encoding', 'gzip')
-InBody(zbuf.getvalue()[:3]
+Equal(cherrypy.lib.encoding.decompress(self.body), "visit #5"
-        
-        # Now check that a second request gets the gzip header and gzipped body
+        # This also tests a bug in 3.0 to 3.0.2 whereby the cached, gzipped
+        # response body was being gzipped a second time.
-        self.getPage("/", method="GET", headers=[('Accept-Encoding', 'gzip')])
-        self.assertHeader('Content-Encoding', 'gzip')
-InBody(zbuf.getvalue()[:3]
+Equal(cherrypy.lib.encoding.decompress(self.body), "visit #5"
-        
-        # Now check that a third request that doesn't accept gzip
-gets another hit
+skips the cache (because the 'Vary' header denies it)
-        self.getPage("/", method="GET")
-        self.assertNoHeader('Content-Encoding')