Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make max-age configurable for logged-out users"

Browse source
This commit is contained in:
jenkins-bot 2019-10-03 22:13:50 +00:00 committed by Gerrit Code Review
commit ec440ce1bf
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/DefaultSettings.php
View file

@ -2788,6 +2788,15 @@ $wgCdnMaxAge = 18000;
*/
$wgCdnMaxageLagged = 30;
/**
* Cache TTL for the user agent sent as max-age, for logged out users.
* Only applies if wgUseCdn is false.
* @see $wgUseCdn
*
* @since 1.35
*/
$wgLoggedOutMaxAge = 0;
/**
* If set, any SquidPurge call on a URL or URLs will send a second purge no less than
* this many seconds later via the job queue. This requires delayed job support.

16
includes/OutputPage.php
View file

@ -2465,10 +2465,20 @@ class OutputPage extends ContextSource {
"s-maxage={$this->mCdnMaxage}, must-revalidate, max-age=0" );
} else {
# We do want clients to cache if they can, but they *must* check for updates
# on revisiting the page.
# on revisiting the page, after the max-age period.
wfDebug( __METHOD__ . ": private caching; {$this->mLastModified} **", 'private' );
$response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
$response->header( "Cache-Control: private, must-revalidate, max-age=0" );
if ( $response->hasCookies() || SessionManager::getGlobalSession()->isPersistent() ) {
$response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
$response->header( "Cache-Control: private, must-revalidate, max-age=0" );
} else {
$response->header(
'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $config->get( 'LoggedOutMaxAge' ) ) . ' GMT'
);
$response->header(
"Cache-Control: private, must-revalidate, max-age={$config->get( 'LoggedOutMaxAge' )}"
);
}
}
if ( $this->mLastModified ) {
$response->header( "Last-Modified: {$this->mLastModified}" );