Merge "objectcache: remove BagOStuff::mergeViaLock() and update RESTBagOStuff"

[lhc/web/wiklou.git] / load.php

diff --git a/load.php b/load.php
index d30a348..4d34e5d 100644 (file)
--- a/load.php
+++ b/load.php
@@ -22,12 +22,11 @@
  * @author Trevor Parscal
  */
 
-use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 
 // This endpoint is supposed to be independent of request cookies and other
-// details of the session. Log warnings for violations of the no-session
-// constraint.
-define( 'MW_NO_SESSION', 'warn' );
+// details of the session. Enforce this constraint with respect to session use.
+define( 'MW_NO_SESSION', 1 );
 
 require __DIR__ . '/includes/WebStart.php';
 
@@ -36,12 +35,15 @@ if ( !$wgRequest->checkUrlExtension() ) {
        return;
 }
 
+// Disable ChronologyProtector so that we don't wait for unrelated MediaWiki
+// writes when getting database connections for ResourceLoader. (T192611)
+MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
+
+$resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
+$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
+
 // Respond to ResourceLoader request
-$resourceLoader = new ResourceLoader(
-       ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
-       LoggerFactory::getInstance( 'resourceloader' )
-);
-$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
+$resourceLoader->respond( $context );
 
 Profiler::instance()->setTemplated( true );