From 9b6a4c922a7db01138ff8819239ca7750a06788d Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Thu, 9 Feb 2012 10:56:36 +0000 Subject: [PATCH] debug statements for HTMLFileCache / Output --- includes/OutputHandler.php | 8 +++++++- includes/cache/HTMLFileCache.php | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php index 4112f8a27c..747140a99f 100644 --- a/includes/OutputHandler.php +++ b/includes/OutputHandler.php @@ -76,7 +76,12 @@ function wfRequestExtension() { * @return string */ function wfGzipHandler( $s ) { - if( !function_exists( 'gzencode' ) || headers_sent() ) { + if( !function_exists( 'gzencode' ) ) { + wfDebug( __FUNCTION__ . "() skipping compression (gzencode unavaible)\n" ); + return $s; + } + if( headers_sent() ) { + wfDebug( __FUNCTION__ . "() skipping compression (headers already sent)\n" ); return $s; } @@ -90,6 +95,7 @@ function wfGzipHandler( $s ) { } if( wfClientAcceptsGzip() ) { + wfDebug( __FUNCTION__ . "() is compressing output\n" ); header( 'Content-Encoding: gzip' ); $s = gzencode( $s, 6 ); } diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php index 92130f693a..12e9b2d621 100644 --- a/includes/cache/HTMLFileCache.php +++ b/includes/cache/HTMLFileCache.php @@ -105,6 +105,7 @@ class HTMLFileCache extends FileCacheBase { wfDebug( __METHOD__ . "()\n"); $filename = $this->cachePath(); + $context->getOutput()->sendCacheControl(); header( "Content-Type: $wgMimeType; charset=UTF-8" ); header( "Content-Language: $wgLanguageCode" ); @@ -113,6 +114,7 @@ class HTMLFileCache extends FileCacheBase { header( 'Content-Encoding: gzip' ); } else { /* Send uncompressed */ + wfDebug( __METHOD__ . " uncompressing cache file and sending it\n" ); readgzfile( $filename ); return; } -- 2.20.1