From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 4 Jul 2005 22:24:06 +0000 (+0000)
Subject: * Workaround for mysterious problem with bogus epoch If-Last-Modified reqs
X-Git-Tag: 1.5.0beta2~11
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=8f1213a7c5d267d356152f75df680ec90591aaa6;p=lhc%2Fweb%2Fwiklou.git

* Workaround for mysterious problem with bogus epoch If-Last-Modified reqs
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4761a8af77..8b27ea16c8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -469,6 +469,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2616) Fix proportional image scaling, giving correct height
 * (bug 2640) Include width and height attributes on unscaled images
 * Workaround for mysterious problem with bogus epoch If-Last-Modified reqs
+* (bug 1109) Suppress compressed output on 304 responses
 
 
 === Caveats ===
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 1316919ca0..a5a69adeee 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -124,6 +124,7 @@ class OutputPage {
 				$this->sendCacheControl();
 				wfDebug( "CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp\n", false );
 				$this->disable();
+				@ob_end_clean(); // Don't output compressed blob
 				return true;
 			} else {
 				wfDebug( "READY  client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp\n", false );