From d2ba63a1dfe07fc9a79c267f6a727c3b69d4ee85 Mon Sep 17 00:00:00 2001 From: Marius Hoch Date: Fri, 19 Jul 2013 03:21:38 +0200 Subject: [PATCH] Use wfResetOutputBuffers in ResourceLoader No need to replicate its logic there. Bug: 46836 Change-Id: I0c6ad90c327e39b9bc35fc3a9ecab39487a1d8b5 --- includes/resourceloader/ResourceLoader.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index ff3ea35b49..29946dc54d 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -607,15 +607,7 @@ class ResourceLoader { // See also http://bugs.php.net/bug.php?id=51579 // To work around this, we tear down all output buffering before // sending the 304. - // On some setups, ob_get_level() doesn't seem to go down to zero - // no matter how often we call ob_get_clean(), so instead of doing - // the more intuitive while ( ob_get_level() > 0 ) ob_get_clean(); - // we have to be safe here and avoid an infinite loop. - // Caching the level is not an option, need to allow it to - // shorten the loop on-the-fly (bug 46836) - for ( $i = 0; $i < ob_get_level(); $i++ ) { - ob_end_clean(); - } + wfResetOutputBuffers( /* $resetGzipEncoding = */ true ); header( 'HTTP/1.0 304 Not Modified' ); header( 'Status: 304 Not Modified' ); -- 2.20.1