From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 5 Nov 2006 22:23:17 +0000 (+0000)
Subject: * (bug 1109) Correct fix for compressed 304 responses when additional output
X-Git-Tag: 1.31.0-rc.0~55276
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=28dcfc26039e8a1d992431e665944beea8541691;p=lhc%2Fweb%2Fwiklou.git

* (bug 1109) Correct fix for compressed 304 responses when additional output
  buffers have been installed within the compression handler
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6e5b131777..f5f17fb6de 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -144,6 +144,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * checkUsernames.php now uses wfDebugLog instead of hardcoded path to log
 * (bug 7810) Update talk namespaces for Occitan
 * Allow case-sensitive URLs to be used for uploading from URLs.
+* (bug 1109) Correct fix for compressed 304 responses when additional output
+  buffers have been installed within the compression handler
 
 
 == Languages updated ==
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7ed49199dd..56705642ce 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -127,7 +127,10 @@ class OutputPage {
 				$this->sendCacheControl();
 				wfDebug( "$fname: CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
 				$this->disable();
-				@ob_end_clean(); // Don't output compressed blob
+				// Don't output compressed blob
+				while( $status = ob_get_status() ) {
+					ob_end_clean();
+				}
 				return true;
 			} else {
 				wfDebug( "$fname: READY  client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );