From 28dcfc26039e8a1d992431e665944beea8541691 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 5 Nov 2006 22:23:17 +0000 Subject: [PATCH] * (bug 1109) Correct fix for compressed 304 responses when additional output buffers have been installed within the compression handler --- RELEASE-NOTES | 2 ++ includes/OutputPage.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 ); -- 2.20.1