* (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 6e5b131..f5f17fb 100644 (file)
--- 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 7ed4919..5670564 100644 (file)
--- 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 );