Index: includes/common.inc
===================================================================
RCS file: /server/cvs-rep/drupal/includes/common.inc,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 common.inc
--- includes/common.inc	17 Oct 2007 21:28:59 -0000	1.1.1.9
+++ includes/common.inc	29 Oct 2007 17:28:07 -0000
@@ -1887,11 +1887,10 @@
         if (zlib_get_coding_type() == 'deflate') {
           $cache = FALSE;
         }
-        else if (zlib_get_coding_type() == FALSE) {
+        else  {
+          // Content is not gzip encoded in the ob_get_contents() buffer
           $data = gzencode($data, 9, FORCE_GZIP);
         }
-        // The remaining case is 'gzip' which means the data is
-        // already compressed and nothing left to do but to store it.
       }
       ob_end_flush();
       if ($cache && $data) {
Index: includes/bootstrap.inc
===================================================================
RCS file: /server/cvs-rep/drupal/includes/bootstrap.inc,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 bootstrap.inc
--- includes/bootstrap.inc	26 Jul 2007 19:16:45 -0000	1.1.1.5
+++ includes/bootstrap.inc	29 Oct 2007 17:29:01 -0000
@@ -576,6 +576,7 @@
   }
   elseif (function_exists('gzencode')) {
     header('Content-Encoding: gzip');
+    @ini_set('zlib.output_compression', 0);
   }
 
   // Send the original request's headers. We send them one after