Remove sometimes erroneous duplicate Content-encoding header for gzip.

As workaround for Apache2+PHP bug, avoid calling flush() in OutputPage::output
so headers aren't eaten during cache save.

diff --git a/includes/Article.php b/includes/Article.php
index 7b122d1..522616d 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1166,13 +1166,6 @@ class Article {
                                return true;
                        } else {
                                wfDebug( " tryFileCache() - starting buffer\n" );                       
-                               if($cache->useGzip() && wfClientAcceptsGzip()) {
-                                       /* For some reason, adding this header line over in
-                                          CacheManager::saveToFileCache() fails on my test
-                                          setup at home, though it works on the live install.
-                                          Make double-sure...  --brion */
-                                       header( "Content-Encoding: gzip" );
-                               }
                                ob_start( array(&$cache, 'saveToFileCache' ) );
                        }
                } else {

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6b8aec6..307148a 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -284,7 +284,7 @@ class OutputPage {
                }
 
                $sk->outputPage( $this );
-               flush();
+               # flush();
        }
 
        function out( $ins )