| Index: trunk/phase3/includes/HTMLFileCache.php |
| — | — | @@ -131,7 +131,9 @@ |
| 132 | 132 | wfDebug(" loadFromFileCache()\n"); |
| 133 | 133 | |
| 134 | 134 | $filename = $this->fileCacheName(); |
| 135 | | - $wgOut->sendCacheControl(); |
| | 135 | + // Raw pages will handle control on their own |
| | 136 | + if( $this->mType !== 'raw' ) |
| | 137 | + $wgOut->sendCacheControl(); |
| 136 | 138 | |
| 137 | 139 | header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" ); |
| 138 | 140 | header( "Content-language: $wgContLanguageCode" ); |
| Index: trunk/phase3/index.php |
| — | — | @@ -75,7 +75,9 @@ |
| 76 | 76 | |
| 77 | 77 | if( $wgUseFileCache && isset($wgTitle) ) { |
| 78 | 78 | wfProfileIn( 'main-try-filecache' ); |
| 79 | | - if( HTMLFileCache::useFileCache() ) { |
| | 79 | + // Raw pages should handle control on their own |
| | 80 | + // even when using file cache. |
| | 81 | + if( $action != 'raw' && HTMLFileCache::useFileCache() ) { |
| 80 | 82 | /* Try low-level file cache hit */ |
| 81 | 83 | $cache = new HTMLFileCache( $wgTitle, $action ); |
| 82 | 84 | if( $cache->isFileCacheGood( /* Assume up to date */ ) ) { |