From: Brion Vibber Date: Sat, 10 Jan 2004 19:42:33 +0000 (+0000) Subject: Remove sometimes erroneous duplicate Content-encoding header for gzip. X-Git-Tag: 1.3.0beta1~1177 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=eb59e628df92b846a7885f06dc9cf1f1f7622201;p=lhc%2Fweb%2Fwiklou.git 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 7b122d1873..522616dde3 100644 --- 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 6b8aec6743..307148a389 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -284,7 +284,7 @@ class OutputPage { } $sk->outputPage( $this ); - flush(); + # flush(); } function out( $ins )