From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 12 Feb 2012 19:33:52 +0000 (+0000)
Subject: revert r111028 (attempt to fix bug 34254)
X-Git-Tag: 1.31.0-rc.0~24748
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=7488eddb04d3c9600bef088990f1686d0f5aaac1;p=lhc%2Fweb%2Fwiklou.git

revert r111028 (attempt to fix bug 34254)

That patch was obviously wrong, it disabled compression for any
requests *blushes*  :-]
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index b574e0c9ab..00d5a430fb 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -21,8 +21,6 @@ production.
 * (bug 30245) Use the correct way to construct a log page title.
 * (bug 34237) Regenerate an empty user_token and save to the database
   when we try to set the user's cookies for login.
-* (bug 34254) Using a gzipped file cache ($wgUseGzip and $wgUseFileCache)
-  compressed the output twice resulting in garbage output (since 1.18)
 * (bug 32210) New edit emails for watched pages always provide a link to the
   edit which triggered the mail.
 * (bug 12021) Added user talk link on Special:Listusers
diff --git a/includes/Setup.php b/includes/Setup.php
index a9cf38189f..c704d293ca 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -388,12 +388,6 @@ if ( $wgCanonicalServer === false ) {
 	$wgCanonicalServer = wfExpandUrl( $wgServer, PROTO_HTTP );
 }
 
-if ( $wgUseFileCache && $wgUseGzip ) {
-	// Bypass any previous output handler to avoid double
-	// compression (bug 34254)
-	wfResetOutputBuffers();
-}
-
 wfProfileIn( $fname . '-misc1' );
 
 # Raise the memory limit if it's too low