* using htmlspecialchars() for safe XHTML output

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

diff --git a/includes/ParserCache.php b/includes/ParserCache.php
index fce8ed3..b6f5345 100644 (file)
--- a/includes/ParserCache.php
+++ b/includes/ParserCache.php
@@ -2,6 +2,7 @@
 /**
  *
  * @package MediaWiki
+ * @subpackage Cache
  */
 
 /**
@@ -18,15 +19,20 @@ class ParserCache {
        function ParserCache( &$memCached ) {
                $this->mMemc =& $memCached;
        }
-       
+
        function getKey( &$article, &$user ) {
-               global $wgDBname;
+               global $wgDBname, $action;
                $hash = $user->getPageRenderingHash();
                $pageid = intval( $article->getID() );
-               $key = "$wgDBname:pcache:idhash:$pageid-$hash";
+               $renderkey = (int)($action == 'render');
+               $key = "$wgDBname:pcache:idhash:$pageid-$renderkey!$hash";
                return $key;
        }
-       
+
+       function getETag( &$article, &$user ) {
+               return 'W/"' . $this->getKey($article, $user) . "--" . $article->mTouched. '"';
+       }
+
        function get( &$article, &$user ) {
                global $wgCacheEpoch;
                $fname = 'ParserCache::get';
@@ -35,6 +41,7 @@ class ParserCache {
                $hash = $user->getPageRenderingHash();
                $pageid = intval( $article->getID() );
                $key = $this->getKey( $article, $user );
+
                wfDebug( "Trying parser cache $key\n" );
                $value = $this->mMemc->get( $key );
                if ( is_object( $value ) ) {
@@ -43,24 +50,30 @@ class ParserCache {
                        $canCache = $article->checkTouched();
                        $cacheTime = $value->getCacheTime();
                        $touched = $article->mTouched;
-                       if ( !$canCache || $value->getCacheTime() <= $touched || $cacheTime < $wgCacheEpoch ) {
+                       if ( !$canCache || $value->expired( $touched ) ) {
                                if ( !$canCache ) {
+                                       wfIncrStats( "pcache_miss_invalid" );
                                        wfDebug( "Invalid cached redirect, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                } else {
+                                       wfIncrStats( "pcache_miss_expired" );
                                        wfDebug( "Key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" );
                                }
                                $this->mMemc->delete( $key );
                                $value = false;
+
+                       } else {
+                               wfIncrStats( "pcache_hit" );
                        }
                } else {
                        wfDebug( "Parser cache miss.\n" );
+                       wfIncrStats( "pcache_miss_absent" );
                        $value = false;
                }
 
                wfProfileOut( $fname );
                return $value;
        }
-       
+
        function save( $parserOutput, &$article, &$user ){
                $key = $this->getKey( $article, $user );
                $now = wfTimestampNow();