}
$unused = null; // To pass it by reference
- Hooks::run( 'BeforeInitialize', array( &$title, &$unused, &$output, &$user, $request, $this ) );
+ Hooks::run( 'BeforeInitialize', [ &$title, &$unused, &$output, &$user, $request, $this ] );
// Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
if ( is_null( $title ) || ( $title->getDBkey() == '' && !$title->isExternal() )
// We have to check here to catch special pages etc.
// We will check again in Article::view().
$permErrors = $title->isSpecial( 'RunJobs' )
- ? array() // relies on HMAC key signature alone
+ ? [] // relies on HMAC key signature alone
: $title->getUserPermissionsErrors( 'read', $user );
if ( count( $permErrors ) ) {
// Bug 32276: allowing the skin to generate output with $wgTitle or
if ( $title->isExternal() ) {
$rdfrom = $request->getVal( 'rdfrom' );
if ( $rdfrom ) {
- $url = $title->getFullURL( array( 'rdfrom' => $rdfrom ) );
+ $url = $title->getFullURL( [ 'rdfrom' => $rdfrom ] );
} else {
$query = $request->getValues();
unset( $query['title'] );
} elseif ( !$this->tryNormaliseRedirect( $title ) ) {
// Prevent information leak via Special:MyPage et al (T109724)
if ( $title->isSpecialPage() ) {
- $specialPage = SpecialPageFactory::getPage( $title->getDBKey() );
- if ( $specialPage instanceof RedirectSpecialPage
- && $this->config->get( 'HideIdentifiableRedirects' )
- && $specialPage->personallyIdentifiableTarget()
- ) {
- list( , $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBKey() );
- $target = $specialPage->getRedirect( $subpage );
- // target can also be true. We let that case fall through to normal processing.
- if ( $target instanceof Title ) {
- $query = $specialPage->getRedirectQuery() ?: array();
- $request = new DerivativeRequest( $this->context->getRequest(), $query );
- $request->setRequestURL( $this->context->getRequest()->getRequestURL() );
- $this->context->setRequest( $request );
- // Do not varnish cache these. May vary even for anons
- $this->context->getOutput()->lowerCdnMaxage( 0 );
- $this->context->setTitle( $target );
- $wgTitle = $target;
- // Reset action type cache. (Special pages have only view)
- $this->action = null;
- $title = $target;
- $output->addJsConfigVars( array(
- 'wgInternalRedirectTargetUrl' => $target->getFullURL( $query ),
- ) );
- $output->addModules( 'mediawiki.action.view.redirect' );
+ $specialPage = SpecialPageFactory::getPage( $title->getDBkey() );
+ if ( $specialPage instanceof RedirectSpecialPage ) {
+ $specialPage->setContext( $this->context );
+ if ( $this->config->get( 'HideIdentifiableRedirects' )
+ && $specialPage->personallyIdentifiableTarget()
+ ) {
+ list( , $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
+ $target = $specialPage->getRedirect( $subpage );
+ // target can also be true. We let that case fall through to normal processing.
+ if ( $target instanceof Title ) {
+ $query = $specialPage->getRedirectQuery() ?: [];
+ $request = new DerivativeRequest( $this->context->getRequest(), $query );
+ $request->setRequestURL( $this->context->getRequest()->getRequestURL() );
+ $this->context->setRequest( $request );
+ // Do not varnish cache these. May vary even for anons
+ $this->context->getOutput()->lowerCdnMaxage( 0 );
+ $this->context->setTitle( $target );
+ $wgTitle = $target;
+ // Reset action type cache. (Special pages have only view)
+ $this->action = null;
+ $title = $target;
+ $output->addJsConfigVars( [
+ 'wgInternalRedirectTargetUrl' => $target->getFullURL( $query ),
+ ] );
+ $output->addModules( 'mediawiki.action.view.redirect' );
+ }
}
}
}
if ( $request->getVal( 'action', 'view' ) != 'view'
|| $request->wasPosted()
- || count( $request->getValueNames( array( 'action', 'title' ) ) )
- || !Hooks::run( 'TestCanonicalRedirect', array( $request, $title, $output ) )
+ || count( $request->getValueNames( [ 'action', 'title' ] ) )
+ || !Hooks::run( 'TestCanonicalRedirect', [ $request, $title, $output ] )
) {
return false;
}
$ignoreRedirect = $target = false;
Hooks::run( 'InitializeArticleMaybeRedirect',
- array( &$title, &$request, &$ignoreRedirect, &$target, &$article ) );
+ [ &$title, &$request, &$ignoreRedirect, &$target, &$article ] );
$page = $article->getPage(); // reflect any hook changes
// Follow redirects only for... redirects.
$user = $this->context->getUser();
if ( !Hooks::run( 'MediaWikiPerformAction',
- array( $output, $page, $title, $user, $request, $this ) )
+ [ $output, $page, $title, $user, $request, $this ] )
) {
return;
}
$trxProfiler = Profiler::instance()->getTransactionProfiler();
if ( $request->wasPosted() && !$action->doesWrites() ) {
$trxProfiler->setExpectations( $trxLimits['POST-nonwrite'], __METHOD__ );
+ $request->markAsSafeRequest();
}
# Let CDN cache things if we can purge them.
return;
}
- if ( Hooks::run( 'UnknownAction', array( $request->getVal( 'action', 'view' ), $page ) ) ) {
+ if ( Hooks::run( 'UnknownAction', [ $request->getVal( 'action', 'view' ), $page ] ) ) {
$output->setStatusCode( 404 );
$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
}
$factory->commitMasterChanges(
__METHOD__,
// Abort if any transaction was too big
- array( 'maxWriteDuration' => $config->get( 'MaxUserDBWriteDuration' ) )
+ [ 'maxWriteDuration' => $config->get( 'MaxUserDBWriteDuration' ) ]
);
// Record ChronologyProtector positions
$factory->shutdown();
$request = $context->getRequest();
if ( $request->wasPosted() && $factory->hasOrMadeRecentMasterChanges() ) {
$expires = time() + $config->get( 'DataCenterUpdateStickTTL' );
- $options = array( 'prefix' => '' );
+ $options = [ 'prefix' => '' ];
$request->response()->setCookie( 'UseDC', 'master', $expires, $options );
$request->response()->setCookie( 'UseCDNCache', 'false', $expires, $options );
}
$request->response()->header( "X-Database-Lagged: true" );
wfDebugLog( 'replication', "Lagged DB used; CDN cache TTL limited to $maxAge seconds" );
}
+
+ // Avoid long-term cache pollution due to message cache rebuild timeouts (T133069)
+ if ( MessageCache::singleton()->isDisabled() ) {
+ $maxAge = $config->get( 'CdnMaxageSubstitute' );
+ $context->getOutput()->lowerCdnMaxage( $maxAge );
+ $request->response()->header( "X-Response-Substitute: true" );
+ }
}
/**
$trxLimits = $this->config->get( 'TrxProfilerLimits' );
$trxProfiler = Profiler::instance()->getTransactionProfiler();
$trxProfiler->setLogger( LoggerFactory::getInstance( 'DBPerformance' ) );
- if ( $request->wasPosted() ) {
- $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
- } else {
+ if ( $request->hasSafeMethod() ) {
$trxProfiler->setExpectations( $trxLimits['GET'], __METHOD__ );
+ } else {
+ $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
}
// If the user has forceHTTPS set to true, or if the user
// isLoggedIn() will do all sorts of weird stuff.
if (
$request->getProtocol() == 'http' &&
+ // switch to HTTPS only when supported by the server
+ preg_match( '#^https://#', wfExpandUrl( $request->getRequestURL(), PROTO_HTTPS ) ) &&
(
$request->getSession()->shouldForceHTTPS() ||
// Check the cookie manually, for paranoia
$redirUrl = preg_replace( '#^http://#', 'https://', $oldUrl );
// ATTENTION: This hook is likely to be removed soon due to overall design of the system.
- if ( Hooks::run( 'BeforeHttpsRedirect', array( $this->context, &$redirUrl ) ) ) {
+ if ( Hooks::run( 'BeforeHttpsRedirect', [ $this->context, &$redirUrl ] ) ) {
if ( $request->wasPosted() ) {
// This is weird and we'd hope it almost never happens. This
// Assure deferred updates are not in the main transaction
wfGetLBFactory()->commitMasterChanges( __METHOD__ );
- // Ignore things like master queries/connections on GET requests
- // as long as they are in deferred updates (which catch errors).
- Profiler::instance()->getTransactionProfiler()->resetExpectations();
+ // Loosen DB query expectations since the HTTP client is unblocked
+ $trxProfiler = Profiler::instance()->getTransactionProfiler();
+ $trxProfiler->resetExpectations();
+ $trxProfiler->setExpectations(
+ $this->config->get( 'TrxProfilerLimits' )['PostSend'],
+ __METHOD__
+ );
// Do any deferred jobs
DeferredUpdates::doUpdates( 'enqueue' );
if ( !$this->config->get( 'RunJobsAsync' ) ) {
// Fall back to running the job here while the user waits
$runner = new JobRunner( $runJobsLogger );
- $runner->run( array( 'maxJobs' => $n ) );
+ $runner->run( [ 'maxJobs' => $n ] );
return;
}
return; // do not make the site unavailable
}
- $query = array( 'title' => 'Special:RunJobs',
- 'tasks' => 'jobs', 'maxjobs' => $n, 'sigexpiry' => time() + 5 );
+ $query = [ 'title' => 'Special:RunJobs',
+ 'tasks' => 'jobs', 'maxjobs' => $n, 'sigexpiry' => time() + 5 ];
$query['signature'] = SpecialRunJobs::getQuerySignature(
$query, $this->config->get( 'SecretKey' ) );
$errno = $errstr = null;
$info = wfParseUrl( $this->config->get( 'Server' ) );
MediaWiki\suppressWarnings();
+ $host = $info['host'];
+ $port = 80;
+ if ( isset( $info['scheme'] ) && $info['scheme'] == 'https' ) {
+ $host = "tls://" . $host;
+ $port = 443;
+ }
+ if ( isset( $info['port'] ) ) {
+ $port = $info['port'];
+ }
$sock = fsockopen(
- $info['host'],
- isset( $info['port'] ) ? $info['port'] : 80,
+ $host,
+ $port,
$errno,
$errstr,
// If it takes more than 100ms to connect to ourselves there
$runJobsLogger->error( "Failed to start cron API (socket error $errno): $errstr" );
// Fall back to running the job here while the user waits
$runner = new JobRunner( $runJobsLogger );
- $runner->run( array( 'maxJobs' => $n ) );
+ $runner->run( [ 'maxJobs' => $n ] );
return;
}
dépôts / lhc / web / wiklou.git / blobdiff