Fix log type and name in revdeleted messages: suppressions are stored in the suppress...

[lhc/web/wiklou.git] / includes / HTMLFileCache.php

diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index 15037cc..68cafa2 100644 (file)
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -20,22 +20,23 @@
  * @ingroup Cache
  */
 class HTMLFileCache {
-       var $mTitle, $mFileCache;
+       var $mTitle, $mFileCache, $mType;
 
-       public function __construct( &$title ) {
+       public function __construct( &$title, $type = 'view' ) {
                $this->mTitle = $title;
-               $this->mFileCache = $this->fileCacheName();
+               $this->mType = ($type == 'raw' || $type == 'view' ) ? $type : false;
+               $this->fileCacheName(); // init name
        }
 
        public function fileCacheName() {
                if( !$this->mFileCache ) {
                        global $wgFileCacheDirectory, $wgRequest;
+                       # Store raw pages (like CSS hits) elsewhere
+                       $subdir = ($this->mType === 'raw') ? 'raw/' : '';
                        $key = $this->mTitle->getPrefixedDbkey();
                        $hash = md5( $key );
                        # Avoid extension confusion
                        $key = str_replace( '.', '%2E', urlencode( $key ) );
-                       # Store raw pages (like CSS hits) elsewhere
-                       $subdir = $wgRequest->getVal('action') == 'raw' ? 'raw/' : '';
        
                        $hash1 = substr( $hash, 0, 1 );
                        $hash2 = substr( $hash, 0, 2 );
@@ -50,6 +51,7 @@ class HTMLFileCache {
        }
 
        public function isFileCached() {
+               if( $this->mType === false ) return false;
                return file_exists( $this->fileCacheName() );
        }
 
@@ -70,11 +72,13 @@ class HTMLFileCache {
                        if( $query == 'title' || $query == 'curid' ) continue;
                        // Normal page view in query form can have action=view.
                        // Raw hits for pages also stored, like .css pages for example.
-                       if( $query == 'action' && ($val == 'view' || $val == 'raw') ) continue;
-                       if( $query == 'usemsgcache' && $val == 'yes' ) continue;
+                       else if( $query == 'action' && ($val == 'view' || $val == 'raw') ) continue;
+                       else if( $query == 'usemsgcache' && $val == 'yes' ) continue;
                        // Below are header setting params
-                       if( $query == 'maxage' || $query == 'smaxage' || $query == 'ctype' || $query == 'gen' )
+                       else if( $query == 'maxage' || $query == 'smaxage' || $query == 'ctype' || $query == 'gen' )
                                continue;
+                       else
+                               return false;
                }
                // Check for non-standard user language; this covers uselang,
                // and extensions for auto-detecting user language.
@@ -124,12 +128,14 @@ class HTMLFileCache {
        public function loadFromFileCache() {
                global $wgOut, $wgMimeType, $wgOutputEncoding, $wgContLanguageCode;
                wfDebug(" loadFromFileCache()\n");
-
                $filename = $this->fileCacheName();
-               $wgOut->sendCacheControl();
-
-               header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-               header( "Content-language: $wgContLanguageCode" );
+               // Raw pages should handle cache control on their own,
+               // even when using file cache. This reduces hits from clients.
+               if( $this->mType !== 'raw' ) {
+                       $wgOut->sendCacheControl();
+                       header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" );
+                       header( "Content-Language: $wgContLanguageCode" );
+               }
 
                if( $this->useGzip() ) {
                        if( wfClientAcceptsGzip() ) {
@@ -141,6 +147,7 @@ class HTMLFileCache {
                        }
                }
                readfile( $filename );
+               $wgOut->disable(); // tell $wgOut that output is taken care of
        }
 
        protected function checkCacheDirs() {
@@ -152,13 +159,12 @@ class HTMLFileCache {
                wfMkdirParents( $mydir2 );
        }
 
-       public function saveToFileCache( $origtext ) {
+       public function saveToFileCache( $text ) {
                global $wgUseFileCache;
-               if( !$wgUseFileCache ) {
-                       return $origtext; // return to output
+               if( !$wgUseFileCache || strlen( $text ) < 512 ) {
+                       // Disabled or empty/broken output (OOM and PHP errors)
+                       return $text;
                }
-               $text = $origtext;
-               if( strcmp($text,'') == 0 ) return '';
 
                wfDebug(" saveToFileCache()\n", false);
 
@@ -193,4 +199,13 @@ class HTMLFileCache {
                return $text;
        }
 
+       public static function clearFileCache( $title ) {
+               global $wgUseFileCache;
+               if( !$wgUseFileCache ) return false;
+               $fc = new self( $title, 'view' );
+               @unlink( $fc->fileCacheName() );
+               $fc = new self( $title, 'raw' );
+               @unlink( $fc->fileCacheName() );
+               return true;
+       }
 }