wikimedia/mediawiki-extensions-CategoryTree
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree synced 2024-11-15 20:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Stop manually messing with caching HTTP headers"

Browse source
This commit is contained in:
jenkins-bot 2019-03-06 15:11:11 +00:00 committed by Gerrit Code Review
parent 3a0a599e2e 60884c60e7
commit d2e04a3391
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extension.json
View file

@ -99,7 +99,6 @@
"CategoryTreeMaxChildren": 200,
"CategoryTreeAllowTag": true,
"CategoryTreeDisableCache": 21600,
"CategoryTreeHTTPCache": false,
"CategoryTreeMaxDepth": {
"10": 1,
"20": 1,

19
includes/ApiCategoryTree.php
View file

@ -40,27 +40,10 @@ class ApiCategoryTree extends ApiBase {
$ct = new CategoryTree( $options );
$depth = CategoryTree::capDepth( $ct->getOption( 'mode' ), $depth );
$config = $this->getConfig();
$ctConfig = ConfigFactory::getDefaultInstance()->makeConfig( 'categorytree' );
$html = $this->getHTML( $ct, $title, $depth, $ctConfig );
if (
$ctConfig->get( 'CategoryTreeHTTPCache' ) &&
$config->get( 'SquidMaxage' ) &&
$config->get( 'UseSquid' )
) {
if ( $config->get( 'UseESI' ) ) {
$this->getRequest()->response()->header(
'Surrogate-Control: max-age=' . $config->get( 'SquidMaxage' ) . ', content="ESI/1.0"'
);
$this->getMain()->setCacheMaxAge( 0 );
} else {
$this->getMain()->setCacheMaxAge( $config->get( 'SquidMaxage' ) );
}
// cache for anons only
$this->getRequest()->response()->header( 'Vary: Accept-Encoding, Cookie' );
// TODO: purge the squid cache when a category page is invalidated
}
$this->getMain()->setCacheMode( 'public' );
$this->getResult()->addContentValue( $this->getModuleName(), 'html', $html );
}