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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4761a8a..8b27ea1 100644 (file)
--- 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 1316919..a5a69ad 100644 (file)
--- 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 );